Diffusion puppet a7fafddce5a9

Merge remote-tracking branch 'upstream/stable'
a7fafddce5a9Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

upstream/stable: (31 commits) (PUP-3186) Only execute symlink code on systems that support it (PUP-3190) Correct acceptance test to ensure output (PUP-3186) Skip creation of symlinked default directory env (PUP-3162) Expand expected config_version (PUP-3190) Change acceptance test to use directory environment (PUP-3190) Improve readability of function creation logic. (PUP-3191) Use FileSystem.readlink in unpacker (PUP-3136) Add detailed exit codes to tests (PUP-3136) Fix Intermittent Acceptance Test Failures (maint) Disable activerecord testcase against puppet-server (PUP-3175) Isolate yamldir for node/check_woy_cache_works.rb (PUP-3173) Fix old references to jvm-puppet in tests. (maint) Fix typos in comments in acceptance test (maint) Generate unique account names (PUP-3222) Rescue StandardError instead of SystemCallError (PUP-3222) Rescue StandardError instead of non-existent exception (PUP-894) Accept CRLs that were "recently" updated (PUP-894) Add specs for current bebavior (PUP-3151) Removed newline from host_entry test fixture (PUP-3151) Added acceptance test for External CA on Jetty ...

Details

Provenance

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

Parents

rPU07036748751c: (PUP-3186) Only execute symlink code on systems that support it
rPUd178570be85e: Merge pull request #3078 from kylog/issue/pup-1244/fix-rpm-yum-version-comp

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUa7fafddce5a9: Merge remote-tracking branch 'upstream/stable' (authored by Josh Cooper <josh@puppetlabs.com>).Sep 11 2014, 8:46 PM

Merged Changes

07036748751c (PUP-3186) Only execute symlink code on systems that support it
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
4dd82de7b84e Merge pull request #3056 from zaphod42/issues/stable/pup-3190-cannot-load-4x…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
14cd47e0b04f (PUP-3190) Correct acceptance test to ensure output
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
29aaadba7aed Merge pull request #3075 from jpartlow/issue/stable/pup-3186-symlinked…
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
f2190c24f43d (PUP-3186) Skip creation of symlinked default directory env
Author
Britt Gresham <britt@puppetlabs.com>
Browse Repository
No Builds
No Audits
c62723bcf68f (PUP-3162) Expand expected config_version
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
1318155ab304 (PUP-3190) Change acceptance test to use directory environment
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
0274f8950330 Merge pull request #3072 from highb/fix/stable/pup-3191_fix_readlink
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
a7c3711328a2 (PUP-3190) Improve readability of function creation logic.
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
47788a8e45f8 (PUP-3191) Use FileSystem.readlink in unpacker
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
20cf9174db61 Merge pull request #3068 from joshcooper/ticket/stable/PUP-894-crl-not-yet-valid
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
00f5a9640307 Merge pull request #3071 from jpartlow/issue/stable/pup-3136-upstart-acceptance
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
421c55bdb2e9 (PUP-3136) Add detailed exit codes to tests
Author
Britt Gresham <britt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d9a1fb0f5adf (PUP-3136) Fix Intermittent Acceptance Test Failures
Author
Britt Gresham <britt@puppetlabs.com>
Browse Repository
No Builds
No Audits
2a332fd20be8 Merge remote-tracking branch 'upstream/pr/3070' into stable
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
9f7501a74d5d Merge branch 'pr/3069' into stable
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
abffbaff7ade (maint) Disable activerecord testcase against puppet-server
Author
Wayne <wayne@puppetlabs.com>
Browse Repository
No Builds
No Audits
071cf088dfcf Merge pull request #3065 from jpartlow/issue/stable/pup-3162-whitelist…
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
b8329b801fd5 (PUP-3175) Isolate yamldir for node/check_woy_cache_works.rb
Author
Wayne <wayne@puppetlabs.com>
Browse Repository
No Builds
No Audits
7c5a457ccf91 (PUP-3173) Fix old references to jvm-puppet in tests.
Author
Wayne <wayne@puppetlabs.com>
Browse Repository
No Builds
No Audits
7726d8917867 (maint) Fix typos in comments in acceptance test
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
0269d827e7c3 (maint) Generate unique account names
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
377770277b22 (PUP-3222) Rescue StandardError instead of SystemCallError
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d0f08c2d1f4 Merge pull request #3063 from joshcooper/ticket/stable/PUP-3222-sytemcallerror
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
c752a9ceea78 (PUP-3222) Rescue StandardError instead of non-existent exception
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
76d485ddba97 (PUP-894) Accept CRLs that were "recently" updated
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
591bf862ed21 (PUP-894) Add specs for current bebavior
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
c709a239df75 Merge pull request #3066 from waynr/maint/stable/pup-3157
Author
wayne <waynr@sdf.org>
Browse Repository
No Builds
No Audits
3f5416e2d8ac Merge pull request #3067 from waynr/maint/stable/pup-3151
Author
wayne <waynr@sdf.org>
Browse Repository
No Builds
No Audits
349e163a1fb1 (PUP-3151) Removed newline from host_entry test fixture
Author
Jeremy Barlow <jeremy.barlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
65904c00c062 (PUP-3151) Added acceptance test for External CA on Jetty
Author
Jeremy Barlow <jeremy.barlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
59b8d6080a76 (PUP-3157) Allow variable DNS name order in helpful error cert name test
Author
Jeremy Barlow <jeremy.barlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
9f123fe62890 (PUP-3162) Switch to a whitelist for $environment interpolation
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
a9bb8e643530 Merge pull request #3064 from highb/fix/master/symlink_check
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
e76f2effc167 (PUP-3191) Fix symlink checking
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
5da162dd1fce (PUP-3190) Add acceptance test for 4x function calls
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
8ffaa4a48325 Merge branch 'pr/3054' into stable
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
c12c206c4c7f (maint) Cleanup test to be more readable
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
64f28706bf9b (maint) Only append to peer_certs if verify succeeded
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
ade0e5002854 (maint) Correct parameter type from SSLContext to StoreContext
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
65b85b8baa0a (PUP-3162) Prevent $environment interpolation in directory environments
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
9394e25aa550 (maint) Remove unused constant from default_manifest_spec
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
0447ea027196 (PUP-3190) Don't assume puppet is in a lib dir
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
7a0a93701b42 (PUP-3174) Make settings catalog skip manifestdir if environmentpath
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

acceptance/

tests/

config/

puppet_manages_own_configuration_in_robust_manner.rb

environment/

cmdline_overrides_environment.rb

external_ca_support/

apache_external_root_ca.rb

func4x_loadable_from_modules.rb

node/

check_woy_cache_works.rb

resource/

service/

ticket_14297_handle_upstart.rb

store_configs/

enc_provides_node_when_storeconfigs_enabled.rb

lib/

puppet/

module_tool/

applications/

pops/

loader/

loader_paths.rb

module_loaders.rb

provider/

service/

ssl/

validator/

default_validator.rb

spec/

integration/

defaults_spec.rb

environments/

default_manifest_spec.rb

settings_interpolation_spec.rb

provider/

service/

windows_spec.rb

util/

windows/

security_spec.rb

lib/

puppet_spec/

unit/

functions/

pops/

loaders/

dependency_loader_spec.rb

loader_paths_spec.rb

module_loaders_spec.rb

provider/

service/

windows_spec.rb

settings_spec.rb

ssl/

validator_spec.rb

rPUa7fafddce5a9

acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb

Loading...

acceptance/tests/environment/cmdline_overrides_environment.rb

Loading...

acceptance/tests/external_ca_support/apache_external_root_ca.rb

Loading...

acceptance/tests/loader/func4x_loadable_from_modules.rb

Loading...

acceptance/tests/node/check_woy_cache_works.rb

Loading...

acceptance/tests/resource/service/ticket_14297_handle_upstart.rb

Loading...

acceptance/tests/store_configs/enc_provides_node_when_storeconfigs_enabled.rb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/module_tool/applications/unpacker.rb

Loading...

lib/puppet/pops/loader/loader_paths.rb

Loading...

lib/puppet/pops/loader/module_loaders.rb

Loading...

lib/puppet/pops/loaders.rb

Loading...

lib/puppet/provider/service/windows.rb

Loading...

lib/puppet/settings.rb

Loading...

lib/puppet/ssl/validator/default_validator.rb

Loading...

spec/integration/defaults_spec.rb

Loading...

spec/integration/environments/default_manifest_spec.rb

Loading...

spec/integration/environments/settings_interpolation_spec.rb

Loading...

spec/integration/provider/service/windows_spec.rb

Loading...

spec/integration/util/windows/security_spec.rb

Loading...

spec/lib/puppet_spec/matchers.rb

Loading...

spec/unit/functions/epp_spec.rb

Loading...

spec/unit/pops/loaders/dependency_loader_spec.rb

Loading...

spec/unit/pops/loaders/loader_paths_spec.rb

Loading...

spec/unit/pops/loaders/module_loaders_spec.rb

Loading...

spec/unit/provider/service/windows_spec.rb

Loading...

spec/unit/settings_spec.rb

Loading...

spec/unit/ssl/validator_spec.rb

Loading...