HomePhorge

Merge remote-tracking branch 'upstream/2.7rc' into HEAD
3b7673059e44Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/2.7rc' into HEAD

  • upstream/2.7rc: (#14761) Add boot, reboot to excludes list for redhat provider (maint) Disable upstart spec test on windows (#14615) Final stub fixes for the tests. (#14615) Fix provider spec tests to work on non gentoo systems maint: Make it easier to test the service provider (Maint) Close filehandles after read in upstart Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3 (#14615) Exclude helperscripts in gentoo service provider

Conflicts:
CHANGELOG
conf/redhat/puppet.spec
spec/integration/provider/service/init_spec.rb
spec/unit/provider/service/init_spec.rb

This commit undoes the restriction on the upstart spec that kept it from
running on windows. And allowed a freebsd test to begin running on 1.9
series ruby

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPU3b7673059e44: Merge remote-tracking branch 'upstream/2.7rc' into HEAD (authored by Andrew Parker <andy@puppetlabs.com>).May 31 2012, 7:43 PM

Merged Changes