From: Patrick Carlisle <patrick@puppetlabs.com>
Date: Fri, 10 Aug 2012 18:52:40 +0000 (-0700)
Subject: Merge branch '2.3.x' into 2.4.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bb1afc311c7d372bb6972504c3d5faa1eaeee6f0;p=puppet-stdlib.git

Merge branch '2.3.x' into 2.4.x

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

bb1afc311c7d372bb6972504c3d5faa1eaeee6f0