Diffusion puppet 86ce2e85b2aa

Merge remote-tracking branch 'upstream/master' into puppet-4
86ce2e85b2aaUnpublished
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/master' into puppet-4

upstream/master: (PUP-417) Make use of QENG-188 to restart puppet in acceptance (PUP-2972) Improve error message for += and -= (PUP-2879) Add two nfsd-related upstart services to the blacklist (docs) Remove stale warning that Windows can't manage symlinks (PUP-2972) Remove += and -= (docs) Clarify possible exit codes and behavior with negative exit codes on Windows (PUP-3001) Revert future parser change removing dynamic scoped defaults (PUP-2994) Make validation of storeconfigs a runtime concern. (maint) Move local egrammar makefile tasks to main Rakefile

Details

Provenance

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

Parents

rPU4d16e8bcd8ae: Merge branch 'master' into puppet-4
rPUe2549ac5f2f6: Merge pull request #2871 from jpartlow/issue/master/pup-417-passenger-acceptance

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPU86ce2e85b2aa: Merge remote-tracking branch 'upstream/master' into puppet-4 (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).Aug 14 2014, 8:03 PM

Merged Changes

e2549ac5f2f6 Merge pull request #2871 from jpartlow/issue/master/pup-417-passenger-acceptance
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
3105b2e392b7 (PUP-417) Make use of QENG-188 to restart puppet in acceptance
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
f0ab1cb5e7b5 Merge pull request #2879 from nfagerlund/docs_exec_exitcodes_windows
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
3cb7cfa02b79 Merge pull request #2960 from kylog/issue/pup-2879/add-more-services-to…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
e41915845843 Merge pull request #2959 from nfagerlund/docs_windows_symlink_straggler
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
70564759bbf9 Merge pull request #2958 from zaphod42/issue/master/pup-2972-remove-plussignment
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
824e38954979 (PUP-2972) Improve error message for += and -=
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
450dd71eb549 (PUP-2879) Add two nfsd-related upstart services to the blacklist
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
226cf612d7c7 (docs) Remove stale warning that Windows can't manage symlinks
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
ec173ba28c77 Merge pull request #2943 from jpartlow/maint/master/move-egrammar-make-to-rake
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
327e28dec34d Merge pull request #2957 from hlindberg/PUP-3001_revert-867-dynamic-scoped…
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
178bbf7ad943 (PUP-2972) Remove += and -=
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
249be83f7045 (docs) Clarify possible exit codes and behavior with negative exit codes on…
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
4533e89c6398 (PUP-3001) Revert future parser change removing dynamic scoped defaults
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
cd3a89e28670 Merge pull request #2953 from hlindberg/PUP-2994_validation-of-exported
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
20f32b5be674 (PUP-2994) Make validation of storeconfigs a runtime concern.
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
189bcf577b2d (maint) Move local egrammar makefile tasks to main Rakefile
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (31)

Path

Size

acceptance/

config/

packages/

lib/

puppet/

acceptance/

common_utils.rb

setup/

packages/

pre-suite/

015_PackageHostsPresets.rb

045_EnsureMasterStartedOnPassenger.rb

tests/

config/

puppet_manages_own_configuration_in_robust_manner.rb

environment/

cmdline_overrides_environment.rb

external_ca_support/

apache_external_root_ca.rb

helpful_error_message_when_hostname_not_match_server_certificate.rb

reports/

resource/

file/

source_attribute.rb

security/

cve-2013-3567_yaml_deserialization_again.rb

ssl/

autosign_command.rb

lib/

puppet/

parser/

pops/

evaluator/

evaluator_impl.rb

runtime3_support.rb

parser/

validation/

provider/

service/

type/

spec/

integration/

parser/

catalog_spec.rb

future_compiler_spec.rb

unit/

pops/

evaluator/

evaluating_parser_spec.rb

variables_spec.rb

provider/

service/

upstart_spec.rb

tasks/

rPU86ce2e85b2aa

acceptance/Gemfile

Loading...

acceptance/Rakefile

Loading...

acceptance/config/packages/options.rb

Loading...

acceptance/lib/puppet/acceptance/common_utils.rb

Loading...

acceptance/setup/packages/pre-suite/010_Install.rb

Loading...

acceptance/setup/packages/pre-suite/015_PackageHostsPresets.rb

Loading...

acceptance/setup/packages/pre-suite/045_EnsureMasterStartedOnPassenger.rb

Loading...

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/helpful_error_message_when_hostname_not_match_server_certificate.rb

Loading...

acceptance/tests/reports/submission.rb

Loading...

acceptance/tests/resource/file/source_attribute.rb

Loading...

acceptance/tests/security/cve-2013-3567_yaml_deserialization_again.rb

Loading...

acceptance/tests/ssl/autosign_command.rb

Loading...

lib/puppet/parser/scope.rb

Loading...

lib/puppet/pops/evaluator/evaluator_impl.rb

Loading...

lib/puppet/pops/evaluator/runtime3_support.rb

Loading...

lib/puppet/pops/issues.rb

Loading...

lib/puppet/pops/parser/makefile

Loading...

lib/puppet/pops/validation/checker4_0.rb

Loading...

lib/puppet/provider/service/init.rb

Loading...

lib/puppet/type/exec.rb

Loading...

lib/puppet/type/file.rb

Loading...

spec/integration/parser/catalog_spec.rb

Loading...

spec/integration/parser/future_compiler_spec.rb

Loading...

spec/integration/parser/scope_spec.rb

Loading...

spec/unit/pops/evaluator/evaluating_parser_spec.rb

Loading...

spec/unit/pops/evaluator/variables_spec.rb

Loading...

spec/unit/provider/service/upstart_spec.rb

Loading...

tasks/parser.rake

Loading...