]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.3.x' into 2.4.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:41 +0000 (14:24 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:41 +0000 (14:24 -0700)
commit417d219aa6e42f2a16af42c98aa063fc1d9d2ecd
tree8a737533940ddd4c6ea9ac4170a9e2f58ffa2709
parent0f45feb31b0100c8f56ad9fff4542296cf51478f
parentd2798b721a68d0e69fd22c4c806d1ae11c759f48
Merge branch '2.3.x' into 2.4.x

* 2.3.x:
  Disable tests that fail on 2.6.x due to #15912