Merge branch 'master' into puppet-4
b955772931dbUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into puppet-4

Details

Provenance

Adrien Thebo <git@somethingsinistral.net>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU6b5fbd6d3227: Merge remote-tracking branch 'upstream/master' into puppet-4
rPUc1f1c47b103f: Merge pull request #2939 from kylog/issue/pup-2379/deprecate-recurse-inf

Branches

Unknown

Tags

Unknown

Event Timeline

Adrien Thebo <git@somethingsinistral.net> committed rPUb955772931db: Merge branch 'master' into puppet-4 (authored by Adrien Thebo <git@somethingsinistral.net>).Aug 5 2014, 7:09 PM

Merged Changes

c1f1c47b103f Merge pull request #2939 from kylog/issue/pup-2379/deprecate-recurse-inf
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
733d7bf5d4a7 (PUP-2379) Note that recurse => inf is deprecated.
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
6b80f6f51aa9 Merge pull request #2937 from jpartlow/issue/master/pup-2898-resources-with…
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
01e8dfa99ce2 (PUP-2898) Specify terminal semicolon for resource bodies
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
b7ce5e6e4d90 Merge pull request #2851 from highb/fix/master/pup-2745_forge_dependency_fix
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
084dd0da1102 Merge pull request #2914 from hlindberg/PUP-2898_resource-expressions
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
5ea173b747a4 (PUP-2898) Fix errors on ruby 1.8.7
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
3d5fd5a1da51 (PUP-501) Check all of the features together
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
4c28090552ff (PUP-501) Check virtual and exported resources
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
71a50a425a61 (PUP-501) Check that empty titles creates no resources
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
96c632737565 (PUP-2898) Don't allow empty string titles
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
493ccb076a9b (PUP-2898) Fix error in *=> implementation
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
4068af9a61db (PUP-501) Test resource expression evaluation
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
0bf063b42c77 (maint) Add tests and fix up dump action
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
4d7c29103d8f (PUP-2898) Add support for Resource Expr with Class type_name
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
f60afbec4be3 (maint) Remove call to 'debugger'
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
c73c13afd730 (PUP-2898) Make Resource Expr comply with spec (left QualifiedReference)
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
acdcb255c83f (maint) Make logic around "missing file" clearer
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
909f2d8b16e1 (maint) Cleanup assignment inside conditional - not needed
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
a501342e8dc8 (maint) Add private/public to @api tags where this were missing
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
d25e462ebe76 (PUP-2898) Add 4x style resource expressions
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
e7cbfd6ce08e (maint) Add assertions to type factory creation of Resource
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
9152f8106539 (maint) Add token name to Token debug string
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
3bd857d94a6b (maint) Output extra info for debugging parser and cleanup
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
b4c0175a498b (maint) Remove stale comments about hyphens in name patterns.
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
9b15e1571ef1 (maint) Add a --dump action to the parser face
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
93a3e21a63a5 (PUP-2898) Drop support for AST Transform of Resources
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
b58c121cc9b1 (maint) Add to_s methods to Token and Factory to get sane parser debug
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
eb046081b442 (maint) Add entry to makefile to generat a debug version of the parser.
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
cd729d9561e1 (PUP-2745) Ignore malformed forge dependencies
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
109784261872 (PUP-2901) Add module dependency validation
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (40)

Path

Size

lib/

puppet/

face/

module/

module_tool/

pops/

evaluator/

access_operator.rb

evaluator_impl.rb

relationship_operator.rb

loader/

model/

parser/

types/

validation/

validator_factory_4_0.rb

type/

file.rb

spec/

integration/

parser/

future_compiler_spec.rb

resource_expressions_spec.rb

lib/

puppet_spec/

compiler.rb

unit/

face/

parser_spec.rb

forge/

module_release_spec.rb

module_tool/

metadata_spec.rb

parser/

functions/

create_resources_spec.rb

pops/

evaluator/

evaluating_parser_spec.rb

parser/

epp_parser_spec.rb

parse_calls_spec.rb

parse_conditionals_spec.rb

parse_containers_spec.rb

parse_resource_spec.rb

transformer/

transform_resource_spec.rb

rPUb955772931db

View Options

lib/puppet/face/module/generate.rb

View Options

lib/puppet/face/parser.rb

View Options

lib/puppet/forge.rb

View Options

lib/puppet/module_tool/dependency.rb

View Options

lib/puppet/module_tool/metadata.rb

View Options

lib/puppet/module_tool/modulefile.rb

View Options

lib/puppet/pops/evaluator/access_operator.rb

View Options

lib/puppet/pops/evaluator/evaluator_impl.rb

View Options

lib/puppet/pops/evaluator/relationship_operator.rb

View Options

lib/puppet/pops/evaluator/runtime3_support.rb

View Options

lib/puppet/pops/issues.rb

View Options

lib/puppet/pops/loader/base_loader.rb

View Options

lib/puppet/pops/model/ast_transformer.rb

View Options

lib/puppet/pops/model/factory.rb

View Options

lib/puppet/pops/model/model_meta.rb

View Options

lib/puppet/pops/model/model_tree_dumper.rb

View Options

lib/puppet/pops/parser/egrammar.ra

View Options

lib/puppet/pops/parser/eparser.rb

View Options

lib/puppet/pops/parser/lexer_support.rb

View Options

lib/puppet/pops/parser/makefile

View Options

lib/puppet/pops/parser/parser_support.rb

View Options

lib/puppet/pops/patterns.rb

View Options

lib/puppet/pops/types/type_factory.rb

View Options

lib/puppet/pops/validation/checker4_0.rb

View Options

lib/puppet/pops/validation/validator_factory_4_0.rb

View Options

lib/puppet/type/file.rb

View Options

spec/integration/parser/future_compiler_spec.rb

View Options

spec/integration/parser/resource_expressions_spec.rb

View Options

spec/lib/puppet_spec/compiler.rb

View Options

spec/unit/face/parser_spec.rb

View Options

spec/unit/forge/module_release_spec.rb

View Options

spec/unit/module_tool/metadata_spec.rb

View Options

spec/unit/parser/functions/create_resources_spec.rb

View Options

spec/unit/pops/evaluator/evaluating_parser_spec.rb

View Options

spec/unit/pops/parser/epp_parser_spec.rb

View Options

spec/unit/pops/parser/parse_calls_spec.rb

View Options

spec/unit/pops/parser/parse_conditionals_spec.rb

View Options

spec/unit/pops/parser/parse_containers_spec.rb

View Options

spec/unit/pops/parser/parse_resource_spec.rb

View Options

spec/unit/pops/transformer/transform_resource_spec.rb

Merge branch 'master' into puppet-4b955772931dbUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (40)

rPUb955772931db

lib/puppet/face/module/generate.rb

lib/puppet/face/parser.rb

lib/puppet/forge.rb

lib/puppet/module_tool/dependency.rb

lib/puppet/module_tool/metadata.rb

lib/puppet/module_tool/modulefile.rb

lib/puppet/pops/evaluator/access_operator.rb

lib/puppet/pops/evaluator/evaluator_impl.rb

lib/puppet/pops/evaluator/relationship_operator.rb

lib/puppet/pops/evaluator/runtime3_support.rb

lib/puppet/pops/issues.rb

lib/puppet/pops/loader/base_loader.rb

lib/puppet/pops/model/ast_transformer.rb

lib/puppet/pops/model/factory.rb

lib/puppet/pops/model/model_meta.rb

lib/puppet/pops/model/model_tree_dumper.rb

lib/puppet/pops/parser/egrammar.ra

lib/puppet/pops/parser/eparser.rb

lib/puppet/pops/parser/lexer_support.rb

lib/puppet/pops/parser/makefile

lib/puppet/pops/parser/parser_support.rb

lib/puppet/pops/patterns.rb

lib/puppet/pops/types/type_factory.rb

lib/puppet/pops/validation/checker4_0.rb

lib/puppet/pops/validation/validator_factory_4_0.rb

lib/puppet/type/file.rb

spec/integration/parser/future_compiler_spec.rb

spec/integration/parser/resource_expressions_spec.rb

spec/lib/puppet_spec/compiler.rb

spec/unit/face/parser_spec.rb

spec/unit/forge/module_release_spec.rb

spec/unit/module_tool/metadata_spec.rb

spec/unit/parser/functions/create_resources_spec.rb

spec/unit/pops/evaluator/evaluating_parser_spec.rb

spec/unit/pops/parser/epp_parser_spec.rb

spec/unit/pops/parser/parse_calls_spec.rb

spec/unit/pops/parser/parse_conditionals_spec.rb

spec/unit/pops/parser/parse_containers_spec.rb

spec/unit/pops/parser/parse_resource_spec.rb

spec/unit/pops/transformer/transform_resource_spec.rb

Merge branch 'master' into puppet-4
b955772931dbUnpublished
Actions