Diffusion puppet 147dad43a2b9

Merge remote-tracking branch 'upstream/master' into puppet-4
147dad43a2b9Unpublished
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: (37 commits) (maint) Namespace constant declaration in specs to prevent warnings (maint) Expect test to fail on windows ruby 2.0 x86 (PUP-3069) Fix path expansion for environment.conf test on Win (PUP-2349) Add windows specific expectation for deprecation_warning (PUP-2349) Add windows specific expectation for deprecation_warning (PUP-3069) Clear configuration_file for tests (PUP-3069) Test both future and current parser with default_manifest (PUP-3069) Update default_manifest setting descriptions (PUP-3069) Change restrict_environment_manifest name (PUP-3163) Create and manage the mode of $reportsdir (maint) Clear record of configured deprecated settings (PUP-3069) Add an integration spec for default_manifest (PUP-3069) Halt compile if environment has manifest conflict (PUP-3069) Add spec test for new default options (PUP-3069) Add default manifest settings PUP-3155 Improve spec tests around the PE puppet version (PUP-3153) Guard against nil when closing Uniquefiles (PUP-2984) Remove old installation directory when going from x64 to x86 (PUP-1884) Migrate MSI deps into puppet repo (PUP-3154) Create and manage the mode of $statedir on redhat ...

Details

Provenance

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

Parents

rPU3c663009ec44: Merge branch 'master' into puppet-4
rPU45b4945e5c5e: Merge pull request #3016 from nfagerlund/docs_37_file_function

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPU147dad43a2b9: Merge remote-tracking branch 'upstream/master' into puppet-4 (authored by Josh Cooper <josh@puppetlabs.com>).Sep 3 2014, 7:05 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

45b4945e5c5e Merge pull request #3016 from nfagerlund/docs_37_file_function
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
0c531cd563d3 Merge pull request #3021 from nfagerlund/docs_clarify_resources_resources
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
6c3bc872fcca (maint) Namespace constant declaration in specs to prevent warnings
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
9050bc1a087a (maint) Expect test to fail on windows ruby 2.0 x86
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
3952cccdb815 Merge branch 'master' of github.com:puppetlabs/puppet
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
8779aa3b5ac8 Merge branch 'feature/master/pup-3069-win-spec-fix'
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
e1a75ff700d8 (PUP-3069) Fix path expansion for environment.conf test on Win
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
b4dd0b227ce1 (PUP-2349) Add windows specific expectation for deprecation_warning
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
44174a0e0f0d (PUP-2349) Add windows specific expectation for deprecation_warning
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
36faedd89ad5 Merge pull request #3032 from jpartlow/feature/master/pup-3069-add…
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec3df953b8a7 (PUP-3069) Clear configuration_file for tests
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
807d2079c2e2 (PUP-3069) Test both future and current parser with default_manifest
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
79b16d008ddb (PUP-3069) Update default_manifest setting descriptions
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
a1453b2aecdd Merge pull request #3024 from hlindberg/PUP-3117_resource-expression-splat…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
4f67f7b93a1c (PUP-3069) Change restrict_environment_manifest name
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
2c26d7ba0120 Merge pull request #3036 from melissaanne/ticket/master/fix-reportsdir-ownership
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
2a284f13c286 (PUP-3163) Create and manage the mode of $reportsdir
Author
Melissa Stone <melissa@puppetlabs.com>
Browse Repository
No Builds
No Audits
f6e1d327f770 (maint) Clear record of configured deprecated settings
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
9fa72d025a2e (PUP-3069) Add an integration spec for default_manifest
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
acf6f9b4a6b1 (PUP-3069) Halt compile if environment has manifest conflict
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
33a3236e91db (PUP-3069) Add spec test for new default options
Author
Britt Gresham <britt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d15ad6b8003d (PUP-3069) Add default manifest settings
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
58771a2bc384 Merge pull request #3031 from andersonmills/fix/master/PUP-3155…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
7e206b6bebec Merge pull request #3029 from cprice404/bug/master/PUP-3153-guard-against-nil…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
1722e76bb385 PUP-3155 Improve spec tests around the PE puppet version
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
ccb7ff634b42 (PUP-3153) Guard against nil when closing Uniquefiles
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
718cb2ee16a6 (PUP-2984) Remove old installation directory when going from x64 to x86
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
6328a4b1689e Merge pull request #3020 from melissaanne/ticket/master/pupet-1884
Author
Matthaus Owens <mlitteken@gmail.com>
Browse Repository
No Builds
No Audits
1ab6030b57e1 Merge pull request #3030 from haus/ticket/master/pup-3154-manage-statedir-in…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
41e5ef794825 (PUP-1884) Migrate MSI deps into puppet repo
Author
Melissa Stone <melissa@puppetlabs.com>
Browse Repository
No Builds
No Audits
757df7537667 (PUP-3154) Create and manage the mode of $statedir on redhat
Author
Matthaus Owens <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
62cd16abc6ff Merge pull request #3001 from haus/ticket/master/pup-3035-add-var-run-puppet-to…
Author
shrug <bradejr@puppetlabs.com>
Browse Repository
No Builds
No Audits
d0c77d262525 Merge pull request #3022 from kylog/issue/pup-2349/cleanup-warning-during…
Author
Peter Huene <peterhuene@gmail.com>
Browse Repository
No Builds
No Audits
5d5c1b1e03cc (maint) Fix bad comment for issue ILLEGAL_VARIABLE_EXPRESSION
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
6596965210f5 (maint) Fix faulty issue ILLEGAL_NUMERIC_PARAMETER and validation
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
7b69a15d1042 (maint) Remove unused issue codes APPEND_FAILED, and DELETE_FAILED
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
9ab1f71fc1a5 (PUP-3117) Complete the implementation of resource expression
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
514d1d622aa9 (maint) Make PuppetSpec::Language emit more helpful stack traces
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
1edb10408723 (PUP-2349) Specify mode as an octal string consistently in spec manifest…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
4dfe6bc88834 (PUP-2349) Force mode property to be a string
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
392c8baa481e (docs) Clarify note about ssh_authorized_keys in resources resource type
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
eba493dfbca7 Merge pull request #3018 from andersonmills/fix/master/PUP2040…
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
a889a7591594 PUP-2040/PE-3113 Remove symlink-ignore tests for symlinkless OSes
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
56be473eb0ff (docs) Mention file() function in file type's content attribute
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
b14fd40b7d19 (PUP-3117) Add tests for combination of default / hash
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
d66f889db442 Merge pull request #3014 from andersonmills/fix/master/PUP2040…
Author
Brian Cain <brian.cain@puppetlabs.com>
Browse Repository
No Builds
No Audits
e7da5369ddad (PUP-3117) Allow multiple *=> in the same body and error on duplicate
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
df16237f912d (docs) Revise and unify explanations of module/file references in function docs
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
984e80162e83 PUP-2040/PE-3113 Ignore symlinks in module build with pmtignore.
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
fd95196c5592 Merge pull request #3007 from MosesMendoza/PUP-2914/master/remove_rgen_deps
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (84)

Path

Size

ext/

build_defaults.yaml

debian/

puppet-common.dirs

puppet-common.postinst

puppet-common.postrm

redhat/

puppet.spec.erb

lib/

puppet/

file_system/

functions/

module_tool/

applications/

node/

parser/

functions/

pops/

evaluator/

evaluator_impl.rb

parser/

validation/

settings/

base_setting.rb

environment_conf.rb

type/

file/

util/

spec/

fixtures/

releases/

jamtur01-apache/

manifests/

unit/

parser/

lexer/

argumentdefaults.pp

casestatement.pp

classheirarchy.pp

classincludes.pp

classpathtest.pp

collection_override.pp

componentrequire.pp

deepclassheirarchy.pp

defineoverrides.pp

ifexpression.pp

implicititeration.pp

multipleinstances.pp

simpledefaults.pp

pops/

parser/

lexer/

argumentdefaults.pp

casestatement.pp

classheirarchy.pp

classincludes.pp

classpathtest.pp

collection_override.pp

componentrequire.pp

deepclassheirarchy.pp

defineoverrides.pp

ifexpression.pp

implicititeration.pp

multipleinstances.pp

simpledefaults.pp

integration/

defaults_spec.rb

default_manifest_spec.rb

parser/

compiler_spec.rb

future_compiler_spec.rb

resource_expressions_spec.rb

type/

lib/

puppet_spec/

unit/

indirector/

facts/

module_tool/

applications/

builder_spec.rb

node/

environment_spec.rb

parser/

compiler_spec.rb

pops/

parser/

parse_resource_spec.rb

validator/

validator_spec.rb

settings/

autosign_setting_spec.rb

environment_conf_spec.rb

file_setting_spec.rb

settings_spec.rb

type/

file/

util/

command_line_spec.rb

rPU147dad43a2b9

ext/build_defaults.yaml

Loading...

ext/debian/control

Loading...

ext/debian/puppet-common.dirs

Loading...

ext/debian/puppet-common.postinst

Loading...

ext/debian/puppet-common.postrm

Loading...

ext/redhat/puppet.spec.erb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/file_system/uniquefile.rb

Loading...

lib/puppet/functions/epp.rb

Loading...

lib/puppet/module_tool/applications/builder.rb

Loading...

lib/puppet/node/environment.rb

Loading...

lib/puppet/parser/compiler.rb

Loading...

lib/puppet/parser/functions/epp.rb

Loading...

lib/puppet/parser/functions/file.rb

Loading...

lib/puppet/parser/functions/template.rb

Loading...

lib/puppet/pops/evaluator/evaluator_impl.rb

Loading...

lib/puppet/pops/issues.rb

Loading...

lib/puppet/pops/parser/egrammar.ra

Loading...

lib/puppet/pops/parser/eparser.rb

Loading...

lib/puppet/pops/validation/checker4_0.rb

Loading...

lib/puppet/settings.rb

Loading...

lib/puppet/settings/base_setting.rb

Loading...

lib/puppet/settings/environment_conf.rb

Loading...

lib/puppet/type/file/content.rb

Loading...

lib/puppet/type/file/source.rb

Loading...

lib/puppet/type/resources.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/execution.rb

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp

Loading...

spec/fixtures/unit/parser/lexer/argumentdefaults.pp

Loading...

spec/fixtures/unit/parser/lexer/casestatement.pp

Loading...

spec/fixtures/unit/parser/lexer/classheirarchy.pp

Loading...

spec/fixtures/unit/parser/lexer/classincludes.pp

Loading...

spec/fixtures/unit/parser/lexer/classpathtest.pp

Loading...

spec/fixtures/unit/parser/lexer/collection_override.pp

Loading...

spec/fixtures/unit/parser/lexer/componentrequire.pp

Loading...

spec/fixtures/unit/parser/lexer/deepclassheirarchy.pp

Loading...

spec/fixtures/unit/parser/lexer/defineoverrides.pp

Loading...

spec/fixtures/unit/parser/lexer/filecreate.pp

Loading...

spec/fixtures/unit/parser/lexer/ifexpression.pp

Loading...

spec/fixtures/unit/parser/lexer/implicititeration.pp

Loading...

spec/fixtures/unit/parser/lexer/multipleinstances.pp

Loading...

spec/fixtures/unit/parser/lexer/multisubs.pp

Loading...

spec/fixtures/unit/parser/lexer/namevartest.pp

Loading...

spec/fixtures/unit/parser/lexer/simpledefaults.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/argumentdefaults.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/casestatement.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/classheirarchy.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/classincludes.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/classpathtest.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/collection_override.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/componentrequire.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/deepclassheirarchy.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/defineoverrides.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/filecreate.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/ifexpression.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/implicititeration.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/multipleinstances.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/multisubs.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/namevartest.pp

Loading...

spec/fixtures/unit/pops/parser/lexer/simpledefaults.pp

Loading...

spec/integration/defaults_spec.rb

Loading...

spec/integration/environments/default_manifest_spec.rb

Loading...

spec/integration/parser/compiler_spec.rb

Loading...

spec/integration/parser/future_compiler_spec.rb

Loading...

spec/integration/parser/resource_expressions_spec.rb

Loading...

spec/integration/type/file_spec.rb

Loading...

spec/lib/puppet_spec/language.rb

Loading...

spec/unit/indirector/facts/facter_spec.rb

Loading...

spec/unit/module_tool/applications/builder_spec.rb

Loading...

spec/unit/node/environment_spec.rb

Loading...

spec/unit/parser/compiler_spec.rb

Loading...

spec/unit/pops/parser/parse_resource_spec.rb

Loading...

spec/unit/pops/validator/validator_spec.rb

Loading...

spec/unit/settings/autosign_setting_spec.rb

Loading...

spec/unit/settings/environment_conf_spec.rb

Loading...

spec/unit/settings/file_setting_spec.rb

Loading...

spec/unit/settings_spec.rb

Loading...

spec/unit/type/file/mode_spec.rb

Loading...

spec/unit/type/file/source_spec.rb

Loading...

spec/unit/type/file_spec.rb

Loading...

spec/unit/util/command_line_spec.rb

Loading...

spec/unit/util/zaml_spec.rb

Loading...