diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-01-14 20:33:44 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-01-15 09:37:44 -0800 |
| commit | 1f0e72db99e8d409ba90c7cd875ff4a51e5a1157 (patch) | |
| tree | 7ae5867e6d0ab80f2cc39949d6ebd61a99c19e93 /lib | |
| parent | ed1d1ad509ac3dd5a38b983ea04b212187cf3f6f (diff) | |
| download | chef-1f0e72db99e8d409ba90c7cd875ff4a51e5a1157.tar.gz | |
add test, fix node attributes deep merge buglcg/lazy-attributes
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib')
| -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 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 |