]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit5fcb972a83c08a7a9dbfd812c4bd523e4b9a54a2
tree2b6d7643daed47da2a1d4ad150238ec8b08d6296
parent7a0e4be2e773c1aa6450fc8e8f043ae161590f0d
parent55b5e6885deb3c95ebd1f5c6bebc709624e78e0f
Merge branch '3.0.x' into 3.x

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