diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-02 14:55:20 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-02 15:08:43 -0700 |
| commit | 21189d25a9385aa9ff3368716824b8333475a08b (patch) | |
| tree | d4316d70ff88b5a43ffff90d04bd789da51cf9d4 /lib/chef/mixin/deep_merge.rb | |
| parent | fb6c052ae6d58db2499cf04ef0595d1e06a4c13c (diff) | |
| download | chef-21189d25a9385aa9ff3368716824b8333475a08b.tar.gz | |
fix Style/PreferredHashMethods
absolutely hard requirement on the fixes that went into chef-config 2.2.11, so the
floor of that gem is bumped up.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/mixin/deep_merge.rb')
| -rw-r--r-- | lib/chef/mixin/deep_merge.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/mixin/deep_merge.rb b/lib/chef/mixin/deep_merge.rb index 9ec2b397d4..1ecd00eb2d 100644 --- a/lib/chef/mixin/deep_merge.rb +++ b/lib/chef/mixin/deep_merge.rb @@ -106,7 +106,7 @@ class Chef if merge_onto.kind_of?(Hash) && merge_with.kind_of?(Hash) merge_with.each do |key, merge_with_value| value = - if merge_onto.has_key?(key) + if merge_onto.key?(key) hash_only_merge(merge_onto[key], merge_with_value) else merge_with_value |