diff options
| author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-10 11:55:24 -0700 |
|---|---|---|
| committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-10 11:55:24 -0700 |
| commit | 313bc438abb32707ea8e1244b73e2ac8cda59764 (patch) | |
| tree | 7010b6e85bd38c1ea230726bc990dda0c239ddf3 /lib/puppet/parser/functions/hash.rb | |
| parent | 659704831ee9a4d3c83410010884405bdfde7e89 (diff) | |
| parent | deafe88e02499a7bdababf0b5dc264fcc3edecf1 (diff) | |
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
Diffstat (limited to 'lib/puppet/parser/functions/hash.rb')
0 files changed, 0 insertions, 0 deletions