diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:43:51 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:43:51 -0700 |
| commit | ee05c32e49cadc2892fcf0e180bc74eacb1e96f9 (patch) | |
| tree | 74a524a17c155fa98ced1e592b07e7389451c49b /lib/puppet | |
| parent | 43c80e800dde673663360a11ef03cb4e33ef0e13 (diff) | |
| download | puppet-stdlib-ee05c32e49cadc2892fcf0e180bc74eacb1e96f9.tar.gz puppet-stdlib-ee05c32e49cadc2892fcf0e180bc74eacb1e96f9.tar.bz2 | |
Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e.
Why? Because this change set should actually be in master and our
merge-up process reverted the change set in master when I reverted from
2.4.x.
This patch reverts the revert, restoring the original change set.
Diffstat (limited to 'lib/puppet')
0 files changed, 0 insertions, 0 deletions