diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:47:53 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:47:53 -0700 |
| commit | 18212dca014d74ecc63c4e1059f7d93d9b0204fe (patch) | |
| tree | 00c785f00404accff28e49f21ba7ed55b375577b /lib/puppet | |
| parent | 81b1f1b37665cc6e3afb0ba94b4367bd542a3ccb (diff) | |
| parent | 9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba (diff) | |
| download | puppet-stdlib-18212dca014d74ecc63c4e1059f7d93d9b0204fe.tar.gz puppet-stdlib-18212dca014d74ecc63c4e1059f7d93d9b0204fe.tar.bz2 | |
Merge branch '3.x' into 4.x
* 3.x:
Revert "Revert "Merge branch '2.5.x' into 3.0.x""
Revert "Merge branch '2.5.x' into 3.0.x"
(maint) Fix spec failures resulting from Facter API changes
Diffstat (limited to 'lib/puppet')
0 files changed, 0 insertions, 0 deletions