Diffusion puppet e26eddd7c75e

Merge remote-tracking branch 'upstream/stable'
e26eddd7c75eUnpublished
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: (maint) Remove failure for empty generated tags (maint) Update test to use resource matcher (maint) Add sitemoduledir to env env tests (PUP-2689) Make AST Resource check tags against "inherited" tags (maint) Remove unused Puppet::Parser::AST::Tag class

Details

Provenance

Andrew Parker <andy@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU9d6b05ca8fe7: Merge branch 'pr/2712' into stable
rPU1c4e536c2631: Merge branch 'pr/2728'

Branches

Unknown

Tags

Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPUe26eddd7c75e: Merge remote-tracking branch 'upstream/stable' (authored by Andrew Parker <andy@puppetlabs.com>).Jun 3 2014, 9:32 PM

Merged Changes

9d6b05ca8fe7 Merge branch 'pr/2712' into stable
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
3a25acbb9041 (maint) Remove failure for empty generated tags
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
5516b06986f6 (maint) Update test to use resource matcher
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
6dd2e1b5cd20 (maint) Add sitemoduledir to env env tests
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
0436eb1e0997 (PUP-2689) Make AST Resource check tags against "inherited" tags
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
31545fa2ed5b (maint) Remove unused Puppet::Parser::AST::Tag class
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

acceptance/

tests/

environment/

use_enc_environment_for_files.rb

use_enc_environment_for_pluginsync.rb

lib/

puppet/

parser/

ast/

util/

spec/

integration/

parser/

compiler_spec.rb

future_compiler_spec.rb

unit/

util/

tagging_spec.rb

rPUe26eddd7c75e

acceptance/tests/environment/use_enc_environment_for_files.rb

Loading...

acceptance/tests/environment/use_enc_environment_for_pluginsync.rb

Loading...

lib/puppet/parser/ast.rb

Loading...

lib/puppet/parser/ast/collexpr.rb

Loading...

lib/puppet/parser/ast/tag.rb

Loading...

lib/puppet/parser/resource.rb

Loading...

lib/puppet/util/tagging.rb

Loading...

spec/integration/parser/compiler_spec.rb

Loading...

spec/integration/parser/future_compiler_spec.rb

Loading...

spec/unit/util/tagging_spec.rb

Loading...