[puppetlabs/puppet] b59222: (PUP-3126) upgrade win32-service to 0.8.6

[GitHub]

Branch: refs/heads/stable
Home: https://github.com/puppetlabs/puppet
Commit: b5922248c308cd86f379ba7518dafa722c756e00
https://github.com/puppetlabs/puppet/commit/b5922248c308cd86f379ba7518dafa722c756e00
Author: Rob Reynolds <ferven...@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)

Changed paths:
M ext/project_data.yaml

Log Message:
-----------
(PUP-3126) upgrade win32-service to 0.8.6

This upgrades the win32-service gem to at least 0.8.6 to take advantage
of the fixes to the service gem. This change includes only the fixes that
we have already applied patches to in puppet-win32-ruby.


Commit: b8b054c391de7807df4361898ee82ddb5be71534
https://github.com/puppetlabs/puppet/commit/b8b054c391de7807df4361898ee82ddb5be71534
Author: Josh Cooper <josh+...@puppetlabs.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)

Changed paths:
M ext/project_data.yaml

Log Message:
-----------
Merge pull request #3128 from ferventcoder/ticket/stable/PUP-3126-upgrade-win32-service

(PUP-3126) upgrade win32-service to 0.8.6


Compare: https://github.com/puppetlabs/puppet/compare/6d0d748f9e28...b8b054c391de

[GitHub]

Branch: refs/heads/master

Commit: 96355a181c3f60c3cda3f259cd51b45b91fb1506
https://github.com/puppetlabs/puppet/commit/96355a181c3f60c3cda3f259cd51b45b91fb1506
Author: Josh Cooper <jo...@puppetlabs.com>

Date: 2014-09-30 (Tue, 30 Sep 2014)

Changed paths:

M ext/build_defaults.yaml

Log Message:
-----------
(PUP-3126) Bump vendored gem dependencies

Include win32-service 0.8.6 when building MSIs.


Commit: 5880224b9c6aa9d01c9f80fd3fe75e74751e65fe
https://github.com/puppetlabs/puppet/commit/5880224b9c6aa9d01c9f80fd3fe75e74751e65fe
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
A acceptance/bin/ci-pe-puppet.sh
A acceptance/bin/ci-rerun-pe-puppet.sh

Log Message:
-----------
(maint) Capture scripts used in pe-puppet acceptance jobs

These can be used (if edited) to run pe-puppet acceptance for manual
testing.


Commit: 8da4320c2063f26bfc89168f7148ba92e6c501e5
https://github.com/puppetlabs/puppet/commit/8da4320c2063f26bfc89168f7148ba92e6c501e5
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/bin/ci-rerun-pe-puppet.sh

Log Message:
-----------
(maint) Allow a two node config for a re-run

And allow setting of host platform.


Commit: f6123505b94954ae2e744605721c80d867b2035f
https://github.com/puppetlabs/puppet/commit/f6123505b94954ae2e744605721c80d867b2035f
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/bin/ci-pe-puppet.sh
M acceptance/bin/ci-rerun-pe-puppet.sh
A acceptance/setup/common/pre-suite/110_SetPEPuppetService.rb

Log Message:
-----------
(maint) Update the ci-pe-puppet scripts for puppetserver


Commit: d59af13b20a003132ba40d5461e91d763ed3b856
https://github.com/puppetlabs/puppet/commit/d59af13b20a003132ba40d5461e91d763ed3b856
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/Gemfile
M acceptance/bin/ci-pe-puppet.sh
M acceptance/bin/ci-rerun-pe-puppet.sh
A acceptance/lib/puppet/acceptance/classifier_utils.rb
A acceptance/lib/puppet/acceptance/classifier_utils_spec.rb
M acceptance/lib/puppet/acceptance/environment_utils_spec.rb

Log Message:
-----------
(PUP-3277) Add acceptance tools for communicating with Classifier

On a master configured with the new Classifier, we need to be able to
interact with the Classifier on behalf of tests which expect their
agents to be able to specify the environment. This commit adds tools to
support this.


Commit: e60996f71267f94e27163d019022c216f5c0064d
https://github.com/puppetlabs/puppet/commit/e60996f71267f94e27163d019022c216f5c0064d
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/environment/cmdline_overrides_environment.rb
M acceptance/tests/environment/directory.rb
M acceptance/tests/environment/directory_environment_with_environment_conf.rb
M acceptance/tests/environment/dynamic.rb
M acceptance/tests/environment/dynamic_environments.rb
M acceptance/tests/environment/static.rb
M acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb
M acceptance/tests/environment/use_agent_environment_when_no_enc.rb
M acceptance/tests/environment/use_enc_environment.rb
M acceptance/tests/environment/use_enc_environment_for_files.rb
M acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
M acceptance/tests/environment/use_environment_from_environmentpath.rb

Log Message:
-----------
(PUP-3277) Update environment tests for default directory env conf

Currently the acceptance tests assume that Puppet is not configured with
an environmentpath set. This will change in Puppet 4.0 and the tests
need to be adjusted to be more intentional about how they configure
their environment, whether for a legacy or a directory environment setup.


Commit: f684adee1b236a87ca683dbee6a08d72eac19de8
https://github.com/puppetlabs/puppet/commit/f684adee1b236a87ca683dbee6a08d72eac19de8
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb
M acceptance/tests/allow_arbitrary_node_name_for_agent.rb
M acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
M acceptance/tests/ordering/master_agent_application.rb
M acceptance/tests/ticket_13948_lib_dir_hook_should_be_called_on_initialization.rb
M acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

Log Message:
-----------
(PUP-3277) Change tests using legacy envs to directory envs

Puppet 4.0 will remove support for legacy environments, and acceptance
tests relying on setting manifest/modulepath directly are being updated
to instead set up a production directory environment.


Commit: eee9365ab63aa42b523fffc821e97bd5845783fb
https://github.com/puppetlabs/puppet/commit/eee9365ab63aa42b523fffc821e97bd5845783fb
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/parser_functions/hiera/lookup_data.rb
M acceptance/tests/parser_functions/hiera_array/lookup_data.rb
M acceptance/tests/parser_functions/hiera_hash/lookup_data.rb

Log Message:
-----------
(PUP-3277) Change hiera lookup tests to use a temp production direnv

The hiera tests were placing some test data in the default configuration
paths and some in temp directories, and were relying on the manifest and
modulepath settings. These settings are deprecated and will be removed.
The tests now setup all configuration in a temporary directory for
consistency and isolation, and make use of environmentpath instead.


Commit: a35bac97d26f4b1f637f9fdf527f969d35e332eb
https://github.com/puppetlabs/puppet/commit/a35bac97d26f4b1f637f9fdf527f969d35e332eb
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/pluginsync/7316_apps_should_be_available_via_pluginsync.rb
M acceptance/tests/pluginsync/7316_faces_with_app_stubs_should_be_available_via_pluginsync.rb
M acceptance/tests/pluginsync/feature/pluginsync_should_sync_features.rb
M acceptance/tests/pluginsync/files_earlier_in_modulepath_take_precendence.rb

Log Message:
-----------
(PUP-3277) Point pluginsync tests to an environmentpath

Pluginsync tests were relying on the deprecated manifest/modulepath
settings. Most changes were a minor reset of base testdir path to an
environmentpath directory. Changes to the
files_earlier_in_modulepath_take_precendence were similar but required
more test file setup.


Commit: 166f70989eb27f7159286643c9f0cfcb63b7975f
https://github.com/puppetlabs/puppet/commit/166f70989eb27f7159286643c9f0cfcb63b7975f
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb

Log Message:
-----------
(maint) Fix cve-2013-4761 acceptance test

The acceptance test was removing the file that would have been executed
by the exploit, and was therefore passing regardless of the state of the
bug. Fixed so that the exploit file creates a separate exploited marker
file, and the test removes and checks only the marker file.


Commit: 6608d61c4e806870fbc9b2e9700ed38747b03a68
https://github.com/puppetlabs/puppet/commit/6608d61c4e806870fbc9b2e9700ed38747b03a68
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb

Log Message:
-----------
(PUP-3277) Change cve test to use environmentpath

This test was relying on the deprecated manifest setting and has been
rewritten to use environmentpath.


Commit: fa3c8520fa19e3e2d9c0839038a823c1ed8f7fac
https://github.com/puppetlabs/puppet/commit/fa3c8520fa19e3e2d9c0839038a823c1ed8f7fac
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/ssl/autosign_command.rb
M acceptance/tests/ssl/certificate_extensions.rb

Log Message:
-----------
(PUP-3277) Disable PE MCollective group in ssl tests

When the tests are run in PE, the PE MCollective group adds a class for
manging MCollective resources an any PE agent node. This interferes
with ssl tests which are testing initial cert generation and signing,
because PE attempts to reset the MCollective cert for the agent, and the
MCollective configuration on the agent to match. By instead using the
classifier_utils helper to temporarily disable this group for the test
nodes, we can test the cert generation in isolation.


Commit: d66e7d326433807d2b7ef33704760a9dcb375801
https://github.com/puppetlabs/puppet/commit/d66e7d326433807d2b7ef33704760a9dcb375801
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb

Log Message:
-----------
(maint) Fix cve-2013-4761 acceptance test

The acceptance test was removing the file that would have been executed
by the exploit, and was therefore passing regardless of the state of the
bug. Fixed so that the exploit file creates a separate exploited marker
file, and the test removes and checks only the marker file.


Commit: bb2bacc6afaf0dbb0ab4312d6774b352f0f2673f
https://github.com/puppetlabs/puppet/commit/bb2bacc6afaf0dbb0ab4312d6774b352f0f2673f
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

Log Message:
-----------
(PUP-3277) Change ticket_7117 env/auth.conf test to use environmentpath

This test has been removed from master, but remains in stable and is
being updated to use environmentpath as part of the general work
preparing acceptance for puppet configurations with environmentpath set
by default.


Commit: 84b58954c958c6c9f80ddf13587399cf42361dba
https://github.com/puppetlabs/puppet/commit/84b58954c958c6c9f80ddf13587399cf42361dba
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb
M acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

Log Message:
-----------
Merge branch 'issue/stable/pup-3277-fix-acceptance-for-default-directory-env-configuration' into stable

* issue/stable/pup-3277-fix-acceptance-for-default-directory-env-configuration:
(PUP-3277) Change ticket_7117 env/auth.conf test to use environmentpath
(maint) Fix cve-2013-4761 acceptance test


Commit: e7d4aa4132b8f4bd66616fd8e48e4638d777620f
https://github.com/puppetlabs/puppet/commit/e7d4aa4132b8f4bd66616fd8e48e4638d777620f
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/Gemfile
A acceptance/bin/ci-pe-puppet.sh
A acceptance/bin/ci-rerun-pe-puppet.sh
A acceptance/lib/puppet/acceptance/classifier_utils.rb
A acceptance/lib/puppet/acceptance/classifier_utils_spec.rb
M acceptance/lib/puppet/acceptance/environment_utils_spec.rb
A acceptance/setup/common/pre-suite/110_SetPEPuppetService.rb
M acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb
M acceptance/tests/allow_arbitrary_node_name_for_agent.rb
M acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
M acceptance/tests/environment/cmdline_overrides_environment.rb
M acceptance/tests/environment/directory.rb
M acceptance/tests/environment/directory_environment_with_environment_conf.rb
M acceptance/tests/environment/dynamic.rb
M acceptance/tests/environment/dynamic_environments.rb
M acceptance/tests/environment/static.rb
M acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb
M acceptance/tests/environment/use_agent_environment_when_no_enc.rb
M acceptance/tests/environment/use_enc_environment.rb
M acceptance/tests/environment/use_enc_environment_for_files.rb
M acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
M acceptance/tests/environment/use_environment_from_environmentpath.rb
M acceptance/tests/ordering/master_agent_application.rb
M acceptance/tests/parser_functions/hiera/lookup_data.rb
M acceptance/tests/parser_functions/hiera_array/lookup_data.rb
M acceptance/tests/parser_functions/hiera_hash/lookup_data.rb
M acceptance/tests/pluginsync/7316_apps_should_be_available_via_pluginsync.rb
M acceptance/tests/pluginsync/7316_faces_with_app_stubs_should_be_available_via_pluginsync.rb
M acceptance/tests/pluginsync/feature/pluginsync_should_sync_features.rb
M acceptance/tests/pluginsync/files_earlier_in_modulepath_take_precendence.rb
M acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb
M acceptance/tests/ssl/autosign_command.rb
M acceptance/tests/ssl/certificate_extensions.rb
M acceptance/tests/ticket_13948_lib_dir_hook_should_be_called_on_initialization.rb
M acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

Log Message:
-----------
Merge branch 'issue/master/pup-3277-fix-acceptance-for-default-directory-env-configuration'

* issue/master/pup-3277-fix-acceptance-for-default-directory-env-configuration:
(PUP-3277) Disable PE MCollective group in ssl tests
(PUP-3277) Change cve test to use environmentpath
(maint) Fix cve-2013-4761 acceptance test
(PUP-3277) Point pluginsync tests to an environmentpath
(PUP-3277) Change hiera lookup tests to use a temp production direnv
(PUP-3277) Change tests using legacy envs to directory envs
(PUP-3277) Update environment tests for default directory env conf
(PUP-3277) Add acceptance tools for communicating with Classifier
(maint) Update the ci-pe-puppet scripts for puppetserver
(maint) Allow a two node config for a re-run
(maint) Capture scripts used in pe-puppet acceptance jobs


Commit: 55d924393b053194c697cd8877e3190977d57849
https://github.com/puppetlabs/puppet/commit/55d924393b053194c697cd8877e3190977d57849
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M ext/build_defaults.yaml

M ext/project_data.yaml

Log Message:
-----------

Merge branch 'stable'

* stable:
(PUP-3277) Change ticket_7117 env/auth.conf test to use environmentpath
(maint) Fix cve-2013-4761 acceptance test
(PUP-3126) Bump vendored gem dependencies

(PUP-3126) upgrade win32-service to 0.8.6

Conflicts:
acceptance/tests/security/cve-2013-4761_injection_of_class_names_loading_code.rb
This test had a maint patch applied in both master/stable, but was
thenfurther updated in master for PUP-3277. The master version
superceeded stable.

acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
This test had been removed in master and replaced by a spec. It was not
re-added in this merge.


Compare: https://github.com/puppetlabs/puppet/compare/eca580fca14c...55d924393b05