]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d371ab 9e8c60a)
Merge branch '3.0.x' into 3.1.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:43:51 +0000 (15:43 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:43:51 +0000 (15:43 -0700)
* 3.0.x:
  Revert "Merge branch '2.5.x' into 3.0.x"

1  2 
CHANGELOG patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG
Simple merge
Puppet module for stdlib