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

Merge branch '2.4.x' into 3.0.x

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

55b5e6885deb3c95ebd1f5c6bebc709624e78e0f