Merge branch '2.7.x'
Conflicts:
spec/integration/network/server/mongrel_spec.rb
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
- rPU80fe59dbf7c7: Remove a bad test that can lead to random hangs...
rPUdc06b8d4b295: Merge pull request #732 from… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes