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

Merge branch '2.2.x' into 2.3.x

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

d2798b721a68d0e69fd22c4c806d1ae11c759f48