Merge branch '2.7.x'
This commit looks like a no-op, but it resolves a conflict for
a commit in 2.7.x that had to do with spec_helper compatibility
w/stdlib and grayskull (#13439)
Conflicts:
lib/puppet/util/settings.rb
Description
Description
Details
Details
- Provenance
Chris Price <chris@puppetlabs.com> Authored on vanmeeuwen Pushed on Jun 2 2015, 2:22 PM - Parents
- rPU2d51b642fcd1: Merge pull request #602 from cprice-puppet/bug/2.7.x/13439-spec-api…
rPUed0e0dbe91a8: Merge pull request #603 from cprice-puppet/bug/master/13439-spec-compatibility - Branches
- Unknown
- Tags
Merged Changes
Merged Changes