diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-08-01 11:30:28 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-08-01 11:45:08 -0700 |
| commit | 4725c97102e1013e212b76b349a97f9dda51fabc (patch) | |
| tree | 3d21a63153af0fd6845801344ad71adf7b35b310 /spec | |
| parent | 2e3d49d17448ae799c88470f2bb5b09d463bbe22 (diff) | |
| download | puppet-stdlib-4725c97102e1013e212b76b349a97f9dda51fabc.tar.gz puppet-stdlib-4725c97102e1013e212b76b349a97f9dda51fabc.tar.bz2 | |
(#8717) Make merge() function work with Ruby 1.8.5
The previous behavior of the merge() function used Array#inject with two
arguments. Ruby 1.8.5 only supports inject being used with one
argument.
This change initializes and empty Hash object and merges each argument
into the accumulator. The last argument still "wins" in the merge.
rspec tests (cd spec; rspec **/*_spec.rb) verified as passing with this
change.
Reviewed-by: Dan Bode
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions