diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:10:29 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:10:29 -0800 |
| commit | 3ac12a699f5d0eb92ef791f1dd2350d50ac0c009 (patch) | |
| tree | c98eb51db38f75fec8773ffe58c0afa7636aa79d /lib/chef/run_list | |
| parent | a2776adb489a952e728f08ed80cebf5be493c0bf (diff) | |
| download | chef-3ac12a699f5d0eb92ef791f1dd2350d50ac0c009.tar.gz | |
role_merge can be elmianted now
Diffstat (limited to 'lib/chef/run_list')
| -rw-r--r-- | lib/chef/run_list/run_list_expansion.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/run_list/run_list_expansion.rb b/lib/chef/run_list/run_list_expansion.rb index 73665f39e7..fed50ee232 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.role_merge(@default_attrs, role.default_attributes) - @override_attrs = Chef::Mixin::DeepMerge.role_merge(@override_attrs, role.override_attributes) + @default_attrs = Chef::Mixin::DeepMerge.deep_merge(@default_attrs, role.default_attributes) + @override_attrs = Chef::Mixin::DeepMerge.deep_merge(@override_attrs, role.override_attributes) end def applied_role?(role_name) |