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


Trivial merge