]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4004a75 614b3fb)
Merge branch '3.1.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:47:48 +0000 (15:47 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:47:48 +0000 (15:47 -0700)
* 3.1.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


Trivial merge
Puppet module for stdlib