From: Josh Partlow <joshua.partlow@puppetlabs.com>
Date: Tue, 29 Oct 2013 19:15:42 +0000 (-0700)
Subject: Merge branch 'fix/master/add_recursive_merge'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=44c181ec0e230768b8dce10de57f9b32638e66e1;p=puppet-stdlib.git

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.
---

44c181ec0e230768b8dce10de57f9b32638e66e1