]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.4.x' into 3.0.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:52 +0000 (14:24 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:52 +0000 (14:24 -0700)
* 2.4.x:
  Disable tests that fail on 2.6.x due to #15912


Trivial merge