diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-18 22:40:33 -0800 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-11-19 15:42:30 -0800 |
| commit | e8b2b0675fa9cd3e583feb4f0a205bc86c80dee2 (patch) | |
| tree | 8314dc4f3c5889fedcb1df60224ffd35d50da149 /lib/chef | |
| parent | afd8d027eabe60cbe5e2007d100445178f1345f1 (diff) | |
| download | chef-e8b2b0675fa9cd3e583feb4f0a205bc86c80dee2.tar.gz | |
remove lots of useless deep merge duping
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/node/attribute.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index 1d564a57e4..59a4067d9e 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -475,7 +475,7 @@ class Chef apply_path(@automatic, path) ] components.inject(nil) do |merged, component| - Chef::Mixin::DeepMerge.hash_only_merge(merged, component) + Chef::Mixin::DeepMerge.hash_only_merge!(merged, component) end end @@ -488,7 +488,7 @@ class Chef def merge_defaults(path) ret = DEFAULT_COMPONENTS.inject(nil) do |merged, component_ivar| component_value = apply_path(instance_variable_get(component_ivar), path) - Chef::Mixin::DeepMerge.deep_merge(component_value, merged) + Chef::Mixin::DeepMerge.deep_merge!(component_value, merged) end end |