diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-11-07 14:32:19 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-11-07 14:32:19 -0800 |
| commit | c53e8f65a16745989def672b6715c9b0c4e99858 (patch) | |
| tree | a1b5d4c2a4d8164466ae3e833a11777f686c2f04 | |
| parent | 483e6f2d87b7931dbebb425fb081745e6c999eae (diff) | |
| download | chef-lcg/chef-15-nillable-deep-merge.tar.gz | |
fix commentslcg/chef-15-nillable-deep-merge
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | lib/chef/node/attribute.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index d0808cfa34..c5731b65a0 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -598,11 +598,11 @@ class Chef elsif merge_onto.kind_of?(Array) && merge_with.kind_of?(Array) merge_onto |= merge_with - # If merge_with is nil, don't replace merge_onto + # If merge_with is NIL, don't replace merge_onto elsif merge_with == NIL merge_onto - # In all other cases, replace merge_onto with merge_with + # In all other cases, replace merge_onto with merge_with else if merge_with.kind_of?(Hash) Chef::Node::ImmutableMash.new(merge_with) @@ -631,11 +631,11 @@ class Chef end merge_onto - # If merge_with is nil, don't replace merge_onto + # If merge_with is NIL, don't replace merge_onto elsif merge_with == NIL merge_onto - # In all other cases, replace merge_onto with merge_with + # In all other cases, replace merge_onto with merge_with else if merge_with.kind_of?(Hash) Chef::Node::ImmutableMash.new(merge_with) |