]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.3.x' into 2.4.x
authorPatrick Carlisle <patrick@puppetlabs.com>
Fri, 10 Aug 2012 18:52:40 +0000 (11:52 -0700)
committerPatrick Carlisle <patrick@puppetlabs.com>
Fri, 10 Aug 2012 18:52:40 +0000 (11:52 -0700)
* 2.3.x:
  Disable tests that fail on 2.6.x due to #15912


Trivial merge