diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-09-01 10:17:33 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-09-01 10:17:33 -0700 |
| commit | c36dbb0e46e8442b33fcec5902867162c6e9105e (patch) | |
| tree | 395fad9d5c82119205bc9d49371b20ac1c9dd67e | |
| parent | e3adc4a72109c09b28dd8f6589336de85e482e12 (diff) | |
| download | chef-lcg/deep-merge-testing.tar.gz | |
testinglcg/deep-merge-testing
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -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 2998866bb2..6a5c79f5a6 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -604,9 +604,9 @@ class Chef # In all other cases, replace merge_onto with merge_with else if merge_with.kind_of?(Hash) - Chef::Node::VividMash.new(merge_with) + Chef::Node::ImmutableMash.new(merge_with) elsif merge_with.kind_of?(Array) - Chef::Node::AttrArray.new(merge_with) + Chef::Node::ImmutableArray.new(merge_with) else merge_with end |