Merge remote-tracking branch 'upstream/stable'
868bf83ea2d3Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

upstream/stable: (PUP-3248) Use tmpdir for generating environments (PUP-3248) Fix PMT tests for directory environment (maint) Remove the resource/host/should_query test (maint) Ensure config acceptance resets uid

Details

Provenance

Josh Partlow <joshua.partlow@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU9e5b0f41165b: Merge pull request #3109 from johnduarte/pmt_directory_env_support
rPU68075ab4e7bd: Merge pull request #3105 from igalic/patch-1

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPU868bf83ea2d3: Merge remote-tracking branch 'upstream/stable' (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).Sep 20 2014, 1:30 AM

Merged Changes

9e5b0f41165b Merge pull request #3109 from johnduarte/pmt_directory_env_support
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
5a49f76f484d (PUP-3248) Use tmpdir for generating environments
Author
John Duarte <john.duarte@puppetlabs.com>
Browse Repository
No Builds
No Audits
25ecd641be53 Merge pull request #3106 from jpartlow/maint/stable/ec2-centos6-acceptance-fixes
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
012662728269 (PUP-3248) Fix PMT tests for directory environment
Author
John Duarte <john.duarte@puppetlabs.com>
Browse Repository
No Builds
No Audits
3f8bb6b89204 (maint) Remove the resource/host/should_query test
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
1d3fc2724c65 (maint) Ensure config acceptance resets uid
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (35)

Path

Size

acceptance/

lib/

puppet/

acceptance/

module_utils.rb

tests/

config/

puppet_manages_own_configuration_in_robust_manner.rb

modules/

install/

already_installed.rb

already_installed_elsewhere.rb

already_installed_with_local_changes.rb

basic_install.rb

force_ignores_dependencies.rb

ignoring_dependencies.rb

nonexistent_directory.rb

nonexistent_module.rb

with_cycles.rb

with_dependencies.rb

with_environment.rb

with_existing_module_directory.rb

with_modulepath.rb

with_necessary_upgrade.rb

with_no_dependencies.rb

with_unnecessary_upgrade.rb

with_unsatisfied_constraints.rb

with_version.rb

list/

with_environment.rb

uninstall/

with_environment.rb

with_multiple_modules_installed.rb

upgrade/

in_a_secondary_directory.rb

introducing_new_dependencies.rb

not_upgradable.rb

to_a_specific_version.rb

to_installed_version.rb

with_constraints_on_it.rb

with_constraints_on_its_dependencies.rb

with_environment.rb

with_local_changes.rb

with_scattered_dependencies.rb

with_update_available.rb

resource/

host/

should_query.rb

rPU868bf83ea2d3

View Options

acceptance/lib/puppet/acceptance/module_utils.rb

View Options

acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb

View Options

acceptance/tests/modules/install/already_installed.rb

View Options

acceptance/tests/modules/install/already_installed_elsewhere.rb

View Options

acceptance/tests/modules/install/already_installed_with_local_changes.rb

View Options

acceptance/tests/modules/install/basic_install.rb

View Options

acceptance/tests/modules/install/force_ignores_dependencies.rb

View Options

acceptance/tests/modules/install/ignoring_dependencies.rb

View Options

acceptance/tests/modules/install/nonexistent_directory.rb

View Options

acceptance/tests/modules/install/nonexistent_module.rb

View Options

acceptance/tests/modules/install/with_cycles.rb

View Options

acceptance/tests/modules/install/with_dependencies.rb

View Options

acceptance/tests/modules/install/with_environment.rb

View Options

acceptance/tests/modules/install/with_existing_module_directory.rb

View Options

acceptance/tests/modules/install/with_modulepath.rb

View Options

acceptance/tests/modules/install/with_necessary_upgrade.rb

View Options

acceptance/tests/modules/install/with_no_dependencies.rb

View Options

acceptance/tests/modules/install/with_unnecessary_upgrade.rb

View Options

acceptance/tests/modules/install/with_unsatisfied_constraints.rb

View Options

acceptance/tests/modules/install/with_version.rb

View Options

acceptance/tests/modules/list/with_environment.rb

View Options

acceptance/tests/modules/uninstall/with_environment.rb

View Options

acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb

View Options

acceptance/tests/modules/upgrade/in_a_secondary_directory.rb

View Options

acceptance/tests/modules/upgrade/introducing_new_dependencies.rb

View Options

acceptance/tests/modules/upgrade/not_upgradable.rb

View Options

acceptance/tests/modules/upgrade/to_a_specific_version.rb

View Options

acceptance/tests/modules/upgrade/to_installed_version.rb

View Options

acceptance/tests/modules/upgrade/with_constraints_on_it.rb

View Options

acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb

View Options

acceptance/tests/modules/upgrade/with_environment.rb

View Options

acceptance/tests/modules/upgrade/with_local_changes.rb

View Options

acceptance/tests/modules/upgrade/with_scattered_dependencies.rb

View Options

acceptance/tests/modules/upgrade/with_update_available.rb

View Options

acceptance/tests/resource/host/should_query.rb

Merge remote-tracking branch 'upstream/stable'868bf83ea2d3UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (35)

rPU868bf83ea2d3

acceptance/lib/puppet/acceptance/module_utils.rb

acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb

acceptance/tests/modules/install/already_installed.rb

acceptance/tests/modules/install/already_installed_elsewhere.rb

acceptance/tests/modules/install/already_installed_with_local_changes.rb

acceptance/tests/modules/install/basic_install.rb

acceptance/tests/modules/install/force_ignores_dependencies.rb

acceptance/tests/modules/install/ignoring_dependencies.rb

acceptance/tests/modules/install/nonexistent_directory.rb

acceptance/tests/modules/install/nonexistent_module.rb

acceptance/tests/modules/install/with_cycles.rb

acceptance/tests/modules/install/with_dependencies.rb

acceptance/tests/modules/install/with_environment.rb

acceptance/tests/modules/install/with_existing_module_directory.rb

acceptance/tests/modules/install/with_modulepath.rb

acceptance/tests/modules/install/with_necessary_upgrade.rb

acceptance/tests/modules/install/with_no_dependencies.rb

acceptance/tests/modules/install/with_unnecessary_upgrade.rb

acceptance/tests/modules/install/with_unsatisfied_constraints.rb

acceptance/tests/modules/install/with_version.rb

acceptance/tests/modules/list/with_environment.rb

acceptance/tests/modules/uninstall/with_environment.rb

acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb

acceptance/tests/modules/upgrade/in_a_secondary_directory.rb

acceptance/tests/modules/upgrade/introducing_new_dependencies.rb

acceptance/tests/modules/upgrade/not_upgradable.rb

acceptance/tests/modules/upgrade/to_a_specific_version.rb

acceptance/tests/modules/upgrade/to_installed_version.rb

acceptance/tests/modules/upgrade/with_constraints_on_it.rb

acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb

acceptance/tests/modules/upgrade/with_environment.rb

acceptance/tests/modules/upgrade/with_local_changes.rb

acceptance/tests/modules/upgrade/with_scattered_dependencies.rb

acceptance/tests/modules/upgrade/with_update_available.rb

acceptance/tests/resource/host/should_query.rb

Merge remote-tracking branch 'upstream/stable'
868bf83ea2d3Unpublished
Actions