diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:35:01 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:35:01 -0800 |
| commit | 3f4d86705c2b72da257fcbdc782c18c3b96b3205 (patch) | |
| tree | 5fe49ff3e44887d72a0bdac55e105431eb1a409a | |
| parent | 37ef51f8bfbb2c53ba1e7b3899112d0ba673635f (diff) | |
| download | chef-3f4d86705c2b72da257fcbdc782c18c3b96b3205.tar.gz | |
deleted the last end accidentally
| -rw-r--r-- | lib/chef/node/attribute.rb | 6 | ||||
| -rw-r--r-- | lib/chef/run_list/run_list_expansion.rb | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index 03e199781f..6c41e230ee 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -422,7 +422,9 @@ class Chef # def merged_attributes(*path) - immutablize(merge_all(path)) + # immutablize( + merge_all(path) + # ) end def combined_override(*path) @@ -543,7 +545,7 @@ class Chef safe_dup(component) end - components.inject(nil) do |merged, component| + components.inject(ImmutableMash.new) do |merged, component| Chef::Mixin::DeepMerge.hash_only_merge!(merged, component) end end diff --git a/lib/chef/run_list/run_list_expansion.rb b/lib/chef/run_list/run_list_expansion.rb index eed3110afc..46b45f1d9e 100644 --- a/lib/chef/run_list/run_list_expansion.rb +++ b/lib/chef/run_list/run_list_expansion.rb @@ -188,3 +188,4 @@ class Chef end end +end |