]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.4.x'
authorPatrick Carlisle <patrick@puppetlabs.com>
Fri, 10 Aug 2012 18:55:24 +0000 (11:55 -0700)
committerPatrick Carlisle <patrick@puppetlabs.com>
Fri, 10 Aug 2012 18:55:24 +0000 (11:55 -0700)
* 2.4.x:
  (Maint) use PuppetlabsSpec::PuppetInternals.scope (master)
  Disable tests that fail on 2.6.x due to #15912


Trivial merge