]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba
treed77590b842275ab493ab304f681d5ac7a296496a
parent4004a758b0c01ac17206a838f91f8cf5c57cc466
parent614b3fbf6c15893e89ed8654fb85596223b5b7c5
Merge branch '3.1.x' into 3.x

* 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