From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 20 Aug 2012 21:25:06 +0000 (-0700)
Subject: Merge branch '3.0.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5fcb972a83c08a7a9dbfd812c4bd523e4b9a54a2;p=puppet-stdlib.git

Merge branch '3.0.x' into 3.x

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

5fcb972a83c08a7a9dbfd812c4bd523e4b9a54a2