diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:43:11 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:43:11 -0700 |
| commit | 43c80e800dde673663360a11ef03cb4e33ef0e13 (patch) | |
| tree | fe8e42f797ed08f1a8fd9f49d1c7a65e1ec6511c /lib/puppet/parser/functions/loadyaml.rb | |
| parent | b8a0f2817279246224dce146a7fb31d14cee4ea5 (diff) | |
| parent | d6d23b495cda0e154b4e73982acc43e586564c0e (diff) | |
| download | puppet-stdlib-43c80e800dde673663360a11ef03cb4e33ef0e13.tar.gz puppet-stdlib-43c80e800dde673663360a11ef03cb4e33ef0e13.tar.bz2 | |
Merge branch '2.4.x'
* 2.4.x:
Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
Diffstat (limited to 'lib/puppet/parser/functions/loadyaml.rb')
0 files changed, 0 insertions, 0 deletions