Fixed problems caused by 2.7.x merge
Several things had changed on master that caused the automatic merge to
not catch problems.
Description
Description
Details
Details
- Provenance
Andrew Parker <andy@puppetlabs.com> Authored on vanmeeuwen Pushed on Jun 2 2015, 2:22 PM - Parents
- rPU53b3fe77b8bb: Re-apply "Merge remote-tracking branch 'upstream/2.7.x'"
- Branches
- Unknown
- Tags