From: Patrick Carlisle <patrick@puppetlabs.com>
Date: Fri, 10 Aug 2012 18:52:03 +0000 (-0700)
Subject: Merge branch '2.2.x' into 2.3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b93a38c005546f8ed0086ca9473615648e2fcba8;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
---

b93a38c005546f8ed0086ca9473615648e2fcba8