HomePhorge

Merge remote-tracking branch 'upstream/master' into stable
d02943ffc0d3Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/master' into stable

  • upstream/master: (767 commits) (maint) Namespace constant declaration in specs to prevent warnings (maint) Expect test to fail on windows ruby 2.0 x86 (PUP-3069) Fix path expansion for environment.conf test on Win (PUP-2349) Add windows specific expectation for deprecation_warning (PUP-2349) Add windows specific expectation for deprecation_warning (PUP-3069) Clear configuration_file for tests (PUP-3069) Test both future and current parser with default_manifest (PUP-3069) Update default_manifest setting descriptions (PUP-3069) Change restrict_environment_manifest name (PUP-3163) Create and manage the mode of $reportsdir (maint) Clear record of configured deprecated settings (PUP-3069) Add an integration spec for default_manifest (PUP-3069) Halt compile if environment has manifest conflict (PUP-3069) Add spec test for new default options (PUP-3069) Add default manifest settings PUP-3155 Improve spec tests around the PE puppet version (PUP-3153) Guard against nil when closing Uniquefiles (PUP-2984) Remove old installation directory when going from x64 to x86 (PUP-1884) Migrate MSI deps into puppet repo (PUP-3154) Create and manage the mode of $statedir on redhat ...

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPUd02943ffc0d3: Merge remote-tracking branch 'upstream/master' into stable (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).Sep 3 2014, 9:44 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.