summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/chef/node/attribute.rb4
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