Merge 2.6.x into 2.7.x
A variety of unexciting conflicts were manually resolved, and the delta
checked for sanity, since it was tiny.
Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
Description
Description
Details
Details
- Provenance
Daniel Pittman <daniel@puppetlabs.com> Authored on vanmeeuwen Pushed on Jun 2 2015, 2:22 PM - Parents
- rPUd174a9f28a66: Updating CHANGELOG and lib/puppet.rb for 2.6.16
rPUa47c42d6b9c7: Update CHANGELOG for 2.7.14rc3 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes