diff options
| author | Bryan McLellan <btm@opscode.com> | 2012-11-20 12:15:48 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-11-20 12:27:37 -0800 |
| commit | 832674e6254b287a9cd188d5a1756955bee45c6c (patch) | |
| tree | da7da8354523cfe32f38097a084d3e09ef8f416a /lib/chef/provider/service.rb | |
| parent | 15f94f373d5c21593e2bad35bc81a190176f7af1 (diff) | |
| parent | 8dc20721f1c4afc3e8434516d1ebf3bc0d9264d9 (diff) | |
| download | chef-832674e6254b287a9cd188d5a1756955bee45c6c.tar.gz | |
Merge branch '10-stable'
Conflicts:
chef-expander/lib/chef/expander/version.rb
chef-server-api/lib/chef-server-api/version.rb
chef-server-webui/lib/chef-server-webui/version.rb
chef-server/lib/chef-server/version.rb
chef-solr/lib/chef/solr/version.rb
chef/lib/chef/encrypted_data_bag_item.rb
chef/spec/unit/encrypted_data_bag_item_spec.rb
ci/jenkins_run_tests.bat
ci/jenkins_run_tests.sh
lib/chef/provider.rb
spec/unit/knife/data_bag_from_file_spec.rb
spec/unit/provider/remote_directory_spec.rb
spec/unit/provider/route_spec.rb
Diffstat (limited to 'lib/chef/provider/service.rb')
| -rw-r--r-- | lib/chef/provider/service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/service.rb b/lib/chef/provider/service.rb index a674f38145..8d76927676 100644 --- a/lib/chef/provider/service.rb +++ b/lib/chef/provider/service.rb @@ -121,7 +121,7 @@ class Chef def action_reload if @current_resource.running - converge_by("disable service #{@new_resource}") do + converge_by("reload service #{@new_resource}") do reload_service Chef::Log.info("#{@new_resource} reloaded") end |