diff options
| author | Josh Partlow <joshua.partlow@puppetlabs.com> | 2013-10-29 12:15:42 -0700 |
|---|---|---|
| committer | Josh Partlow <joshua.partlow@puppetlabs.com> | 2013-10-29 12:22:49 -0700 |
| commit | 44c181ec0e230768b8dce10de57f9b32638e66e1 (patch) | |
| tree | e54a1cc1e713776d69d90f4ea502d48daa25bfca /spec/unit/puppet/parser/functions/time_spec.rb | |
| parent | ae4f52e9e5db1a97ad77b159f11fdbd7ddbad3dd (diff) | |
| parent | 199ca9c78be3ceb7d8d49329ea28ff75e53d979e (diff) | |
| download | puppet-stdlib-44c181ec0e230768b8dce10de57f9b32638e66e1.tar.gz puppet-stdlib-44c181ec0e230768b8dce10de57f9b32638e66e1.tar.bz2 | |
Merge branch 'fix/master/add_recursive_merge'
* fix/master/add_recursive_merge:
(#20200) Add a recursive merge function.
Closes GH-189
This patch changes the original pull request to draw in the overlay function as
a Proc and make use of Hash.merge {} for resolving key conflicts.
Diffstat (limited to 'spec/unit/puppet/parser/functions/time_spec.rb')
0 files changed, 0 insertions, 0 deletions