]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae4f52e 199ca9c)
Merge branch 'fix/master/add_recursive_merge'
authorJosh Partlow <joshua.partlow@puppetlabs.com>
Tue, 29 Oct 2013 19:15:42 +0000 (12:15 -0700)
committerJosh Partlow <joshua.partlow@puppetlabs.com>
Tue, 29 Oct 2013 19:22:49 +0000 (12:22 -0700)
* 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.


Trivial merge
Puppet module for stdlib