diff options
author | tyler-ball <tyleraball@gmail.com> | 2014-12-17 18:57:22 -0800 |
---|---|---|
committer | tyler-ball <tyleraball@gmail.com> | 2014-12-17 18:57:22 -0800 |
commit | f68218380f137f6c6ff51406da087fd9e81304a9 (patch) | |
tree | 0606fe4f983cfa2c3fc68dd3315abb1a1a4c0535 /lib/chef/run_context.rb | |
parent | 19f7b0f1668e5801f44570f52285f8a1bde516c0 (diff) | |
download | chef-f68218380f137f6c6ff51406da087fd9e81304a9.tar.gz |
Resolving conflicsts from giant rebase
Diffstat (limited to 'lib/chef/run_context.rb')
-rw-r--r-- | lib/chef/run_context.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/run_context.rb b/lib/chef/run_context.rb index d14035da2f..6803dc5796 100644 --- a/lib/chef/run_context.rb +++ b/lib/chef/run_context.rb @@ -104,7 +104,7 @@ class Chef if nr.instance_of?(Chef::Resource) @immediate_notification_collection[nr.name] << notification else - @immediate_notification_collection[nr.to_s] << notification + @immediate_notification_collection[nr.declared_key] << notification end end @@ -115,7 +115,7 @@ class Chef if nr.instance_of?(Chef::Resource) @delayed_notification_collection[nr.name] << notification else - @delayed_notification_collection[nr.to_s] << notification + @delayed_notification_collection[nr.declared_key] << notification end end @@ -123,7 +123,7 @@ class Chef if resource.instance_of?(Chef::Resource) return @immediate_notification_collection[resource.name] else - return @immediate_notification_collection[resource.to_s] + return @immediate_notification_collection[resource.declared_key] end end @@ -131,7 +131,7 @@ class Chef if resource.instance_of?(Chef::Resource) return @delayed_notification_collection[resource.name] else - return @delayed_notification_collection[resource.to_s] + return @delayed_notification_collection[resource.declared_key] end end |