]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit44c181ec0e230768b8dce10de57f9b32638e66e1
treee54a1cc1e713776d69d90f4ea502d48daa25bfca
parentae4f52e9e5db1a97ad77b159f11fdbd7ddbad3dd
parent199ca9c78be3ceb7d8d49329ea28ff75e53d979e
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.