]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '3.x'
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:25:17 +0000 (14:25 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:25:17 +0000 (14:25 -0700)
commit4e25230dd3899ae117a6b621fc6233cb4b305c5a
tree996c16c414944920b3aa97abced19f020881dff2
parentc0639d06e147a52fb040e6aea8e2c80f498a1cb4
parent5fcb972a83c08a7a9dbfd812c4bd523e4b9a54a2
Merge branch '3.x'

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