diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:46:57 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:46:57 -0700 |
| commit | 9693c04c9d877e0f877418bc41e16f01aaf784cd (patch) | |
| tree | a8530a855d272b4f63b506356294cc15943d181c /lib/puppet/parser/functions/merge.rb | |
| parent | d6d23b495cda0e154b4e73982acc43e586564c0e (diff) | |
Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e.
This backwards-compatible additional functionality is targeted at the
next minor release. There are already backwards-incompatible changes in
the master branch so we need to establish a new minor branch.
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
0 files changed, 0 insertions, 0 deletions