diff options
| author | sersut <serdar@opscode.com> | 2013-05-14 11:49:16 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-05-14 11:49:16 -0700 |
| commit | eef83d8ab5943af1dd3b25ccc94ef71d772d945a (patch) | |
| tree | f1e3125e4ba6fdcfb08e0f5114758f0524494112 /lib/chef/provider.rb | |
| parent | 564ac7a3761fd870eb867b985b01273510115cf2 (diff) | |
| parent | 664ee74decc3b069269b4f079a3e7a86613b0af1 (diff) | |
| download | chef-eef83d8ab5943af1dd3b25ccc94ef71d772d945a.tar.gz | |
Merge branch 'master' into file-refactor
Conflicts:
spec/unit/knife/configure_spec.rb
spec/unit/provider/remote_file_spec.rb
Diffstat (limited to 'lib/chef/provider.rb')
| -rw-r--r-- | lib/chef/provider.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb index 2d1c28ab1a..6bdb3ed342 100644 --- a/lib/chef/provider.rb +++ b/lib/chef/provider.rb @@ -169,7 +169,7 @@ class Chef # this block cannot interact with resources outside, e.g., # manipulating notifies. - converge_by ("would evaluate block and run any associated actions") do + converge_by ("evaluate block and run any associated actions") do saved_run_context = @run_context @run_context = @run_context.dup @run_context.resource_collection = Chef::ResourceCollection.new |