Merge branch '2.7.x'
- 2.7.x: Fix unit test failure in fileserver due to modules
Conflicts:
test/network/handler/fileserver.rb
Description
Description
Details
Details
- Provenance
Patrick Carlisle <patrick@puppetlabs.com> Authored on vanmeeuwen Pushed on Jun 2 2015, 2:22 PM - Parents
- rPU61ba8ce2823c: Merge pull request #768 from nicklewis/fix-fileserver-test-failure
rPUfc452f16fe06: Merge pull request #761 from cprice-puppet/bug/master/13559-two-console… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes