diff options
| author | danielsdeleo <dan@opscode.com> | 2012-10-19 11:38:43 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2012-10-19 16:00:14 -0700 |
| commit | 17329e3456cc0db6fffb8ef83849bb0228aaa468 (patch) | |
| tree | 7e32fa078511d247fcccbb6416aee9952e75bf90 /chef/lib | |
| parent | 73859742341c45b4e539204e95c295854d50b61c (diff) | |
| download | chef-17329e3456cc0db6fffb8ef83849bb0228aaa468.tar.gz | |
[CHEF-2737] remove unused array sorting feature
Diffstat (limited to 'chef/lib')
| -rw-r--r-- | chef/lib/chef/mixin/deep_merge.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chef/lib/chef/mixin/deep_merge.rb b/chef/lib/chef/mixin/deep_merge.rb index 2c82d39d2d..d443066cad 100644 --- a/chef/lib/chef/mixin/deep_merge.rb +++ b/chef/lib/chef/mixin/deep_merge.rb @@ -73,8 +73,6 @@ class Chef # Set to string value to signify prefix which deletes elements from existing element # A colon is appended when indicating a specific value, eg: # :knockout_prefix => "dontmerge", is referenced as "dontmerge:foobar" in an array - # :sort_merged_arrays DEFAULT: false - # Set to true to sort all arrays that are merged together # :merge_debug DEFAULT: false # Set to true to get console output of merge process for debugging # @@ -108,7 +106,6 @@ class Chef knockout_prefix = options[:knockout_prefix] || nil raise InvalidParameter, "knockout_prefix cannot be an empty string in deep_merge!" if knockout_prefix == "" # request that we sort together any arrays when they are merged - sort_merged_arrays = options[:sort_merged_arrays] || false di = options[:debug_indent] || '' # do nothing if source is nil return dest if source.nil? @@ -169,7 +166,6 @@ class Chef end puts "#{di} merging arrays: #{source.inspect} :: #{dest.inspect}" if merge_debug dest = dest | source - dest.sort! if sort_merged_arrays else puts "#{di} overwriting dest: #{source.inspect} -over-> #{dest.inspect}" if merge_debug dest = overwrite_unmergeables(source, dest, options) |