]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '3.x' into 4.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:47:53 +0000 (15:47 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:47:53 +0000 (15:47 -0700)
commit18212dca014d74ecc63c4e1059f7d93d9b0204fe
tree00c785f00404accff28e49f21ba7ed55b375577b
parent81b1f1b37665cc6e3afb0ba94b4367bd542a3ccb
parent9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba
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