diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:13:28 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:13:28 -0800 |
| commit | 37ef51f8bfbb2c53ba1e7b3899112d0ba673635f (patch) | |
| tree | db6ad122e227b4d88a07f4fa603006f954d81f4e | |
| parent | 3ac12a699f5d0eb92ef791f1dd2350d50ac0c009 (diff) | |
| download | chef-37ef51f8bfbb2c53ba1e7b3899112d0ba673635f.tar.gz | |
#role_merge becomes #merge not #deep_merge
| -rw-r--r-- | lib/chef/run_list/run_list_expansion.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/run_list/run_list_expansion.rb b/lib/chef/run_list/run_list_expansion.rb index fed50ee232..eed3110afc 100644 --- a/lib/chef/run_list/run_list_expansion.rb +++ b/lib/chef/run_list/run_list_expansion.rb @@ -96,8 +96,8 @@ class Chef end def apply_role_attributes(role) - @default_attrs = Chef::Mixin::DeepMerge.deep_merge(@default_attrs, role.default_attributes) - @override_attrs = Chef::Mixin::DeepMerge.deep_merge(@override_attrs, role.override_attributes) + @default_attrs = Chef::Mixin::DeepMerge.merge(@default_attrs, role.default_attributes) + @override_attrs = Chef::Mixin::DeepMerge.merge(@override_attrs, role.override_attributes) end def applied_role?(role_name) @@ -188,4 +188,3 @@ class Chef end end -end |