Merge remote-tracking branch 'upstream/master' into puppet-4
5db06a6ad921Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/master' into puppet-4

upstream/master: (maint) make lmhosts disabled spec msg friendlier (PUP-2766) Make newer environment tests run in PE env (PUP-398) Munge package source on Windows

Details

Provenance

Josh Cooper <josh@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU8416126831e0: Merge branch 'master' into puppet-4
rPU7b311a0ea1aa: Merge pull request #2921 from Iristyle/maint/windows-lmhosts-disabled-spec…

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPU5db06a6ad921: Merge remote-tracking branch 'upstream/master' into puppet-4 (authored by Josh Cooper <josh@puppetlabs.com>).Jul 30 2014, 1:38 AM

Merged Changes

7b311a0ea1aa Merge pull request #2921 from Iristyle/maint/windows-lmhosts-disabled-spec…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
a2e95e2c432d (maint) make lmhosts disabled spec msg friendlier
Author
Ethan J. Brown <Iristyle@github>
Browse Repository
No Builds
No Audits
8c80d5db09bc Merge pull request #2880 from fiddyspence/feature/2945/warning_on_windows_packa…
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
1757c0eab46e Merge pull request #2920 from jpartlow/issue/master/pup-2776-directory-env…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
290c4e00292d (PUP-2766) Make newer environment tests run in PE env
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
20e0dcdb4c4a (PUP-398) Munge package source on Windows
Author
fiddyspence <chris@spence.org.uk>
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

acceptance/

lib/

puppet/

acceptance/

environment_utils.rb

environment_utils_spec.rb

install_utils_spec.rb

tests/

environment/

can_enumerate_environments.rb

directory.rb

directory_environment_with_environment_conf.rb

dynamic.rb

static.rb

use_environment_from_environmentpath.rb

lib/

puppet/

provider/

package/

windows/

spec/

integration/

util/

windows/

security_spec.rb

unit/

provider/

package/

windows/

package_spec.rb

rPU5db06a6ad921

View Options

acceptance/lib/puppet/acceptance/environment_utils.rb

View Options

acceptance/lib/puppet/acceptance/environment_utils_spec.rb

View Options

acceptance/lib/puppet/acceptance/install_utils_spec.rb

View Options

acceptance/tests/environment/can_enumerate_environments.rb

View Options

acceptance/tests/environment/directory.rb

View Options

acceptance/tests/environment/directory_environment_with_environment_conf.rb

View Options

acceptance/tests/environment/dynamic.rb

View Options

acceptance/tests/environment/static.rb

View Options

acceptance/tests/environment/use_environment_from_environmentpath.rb

View Options

lib/puppet/provider/package/windows.rb

View Options

lib/puppet/provider/package/windows/exe_package.rb

View Options

lib/puppet/provider/package/windows/msi_package.rb

View Options

lib/puppet/provider/package/windows/package.rb

View Options

spec/integration/util/windows/security_spec.rb

View Options

spec/unit/provider/package/windows/package_spec.rb

Merge remote-tracking branch 'upstream/master' into puppet-45db06a6ad921UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (15)

rPU5db06a6ad921

acceptance/lib/puppet/acceptance/environment_utils.rb

acceptance/lib/puppet/acceptance/environment_utils_spec.rb

acceptance/lib/puppet/acceptance/install_utils_spec.rb

acceptance/tests/environment/can_enumerate_environments.rb

acceptance/tests/environment/directory.rb

acceptance/tests/environment/directory_environment_with_environment_conf.rb

acceptance/tests/environment/dynamic.rb

acceptance/tests/environment/static.rb

acceptance/tests/environment/use_environment_from_environmentpath.rb

lib/puppet/provider/package/windows.rb

lib/puppet/provider/package/windows/exe_package.rb

lib/puppet/provider/package/windows/msi_package.rb

lib/puppet/provider/package/windows/package.rb

spec/integration/util/windows/security_spec.rb

spec/unit/provider/package/windows/package_spec.rb

Merge remote-tracking branch 'upstream/master' into puppet-4
5db06a6ad921Unpublished
Actions