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

Merge branch '2.4.x'

* 2.4.x:
  (Maint) use PuppetlabsSpec::PuppetInternals.scope (master)
  Disable tests that fail on 2.6.x due to #15912
---

313bc438abb32707ea8e1244b73e2ac8cda59764