diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:47:59 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:47:59 -0700 |
commit | 937096cdcab48df7564706b2a4e09c9af9155a9a (patch) | |
tree | 74a524a17c155fa98ced1e592b07e7389451c49b /lib/facter | |
parent | ee05c32e49cadc2892fcf0e180bc74eacb1e96f9 (diff) | |
parent | 9693c04c9d877e0f877418bc41e16f01aaf784cd (diff) | |
download | puppet-stdlib-937096cdcab48df7564706b2a4e09c9af9155a9a.tar.gz puppet-stdlib-937096cdcab48df7564706b2a4e09c9af9155a9a.tar.bz2 |
Merge branch '2.5.x'
* 2.5.x:
Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
Diffstat (limited to 'lib/facter')
0 files changed, 0 insertions, 0 deletions