]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.2.x' into 2.3.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:23 +0000 (14:24 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:23 +0000 (14:24 -0700)
commitd2798b721a68d0e69fd22c4c806d1ae11c759f48
tree0825cc3d9c2481cac7a0681b62dd7b6448450a89
parent607cb542751b41ea608623ec13e0a6ef72b31cd3
parent73261f14ad07b158e4ab68dc7d0579f7cd6a9f6a
Merge branch '2.2.x' into 2.3.x

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