]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
projects / puppet-stdlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: efb0a85 18212dc)
Merge branch '4.x'
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:48:01 +0000 (15:48 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:48:01 +0000 (15:48 -0700)
commitaa22cded089d0d33cfd840c27caac48cee7a9013
tree00c785f00404accff28e49f21ba7ed55b375577btree | snapshot
parentefb0a85b41b390e14aece19e4473d1171fe64126commit | diff
parent18212dca014d74ecc63c4e1059f7d93d9b0204fecommit | diff
Merge branch '4.x'

* 4.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
Puppet module for stdlib