summaryrefslogtreecommitdiff
path: root/lib/chef/node/attribute.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/node/attribute.rb')
-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 29b60a98d5..3383b3c7e5 100644
--- a/lib/chef/node/attribute.rb
+++ b/lib/chef/node/attribute.rb
@@ -596,7 +596,7 @@ class Chef
merge_with.each do |key, merge_with_value|
value =
if merge_onto.key?(key)
- deep_merge!(safe_dup(merge_onto[key]), merge_with_value)
+ deep_merge!(safe_dup(merge_onto.internal_get(key)), merge_with_value)
else
merge_with_value
end
@@ -632,7 +632,7 @@ class Chef
merge_with.each do |key, merge_with_value|
value =
if merge_onto.key?(key)
- hash_only_merge!(safe_dup(merge_onto[key]), merge_with_value)
+ hash_only_merge!(safe_dup(merge_onto.internal_get(key)), merge_with_value)
else
merge_with_value
end