]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit313bc438abb32707ea8e1244b73e2ac8cda59764
tree7010b6e85bd38c1ea230726bc990dda0c239ddf3
parent659704831ee9a4d3c83410010884405bdfde7e89
parentdeafe88e02499a7bdababf0b5dc264fcc3edecf1
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