Merge branch '2.7rc' into 2.7.x
9758fdc59698Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7rc' into 2.7.x

Details

Provenance

Moses Mendoza <moses@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU8db4418ebb80: Merge pull request #736 from mkincaid/27confines
rPU20c3da38aca4: Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3

Branches

Unknown

Tags

Unknown

Event Timeline

Moses Mendoza <moses@puppetlabs.com> committed rPU9758fdc59698: Merge branch '2.7rc' into 2.7.x (authored by Moses Mendoza <moses@puppetlabs.com>).May 30 2012, 12:47 AM

Merged Changes

20c3da38aca4 Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3
Author
Moses Mendoza <moses@puppetlabs.com>
Browse Repository
No Builds
No Audits
13505c06276e Merge remote-tracking branch 'haus/ticket/2.7rc/14297_handle_upstart_better'…
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
a45942b42c1d (#14297) Don't remove tty1 or rsyslog during upstart acceptance
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
466ab492841d (#14297) Define agent in upstart acceptance test
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
56862cad566c Merge remote-tracking branch 'zaphod42/bug/2.7rc/14343-variable-lookup-fails…
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
f5d1f74de754 (#14297) Update upstart provider acceptance tests
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
3c5ef408e859 (#14297) Clean up upstart provider and tests
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
36c41e102e34 (#14343) Test cases for more forms of variable lookup
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
6cca0612c762 (#14297) Add acceptance test for upstart provider
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
b9ed02670e35 (#14297) Update spec tests for upstart provider
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
91827e8daecb (#14297) Handle upstart services better
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
3541db606b13 (#14343) Lookup in correct inherited scope
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
2d83e226dad9 (Maint) Added test for fully qualified variables
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

CHANGELOG

acceptance/

tests/

resource/

service/

ticket_14297_handle_upstart.rb

conf/

redhat/

puppet.spec

lib/

puppet/

parser/

scope.rb

provider/

service/

upstart.rb

spec/

unit/

parser/

scope_spec.rb

provider/

service/

upstart_spec.rb

rPU9758fdc59698

View Options

CHANGELOG

View Options

acceptance/tests/resource/service/ticket_14297_handle_upstart.rb

View Options

conf/redhat/puppet.spec

View Options

lib/puppet/parser/scope.rb

View Options

lib/puppet/provider/service/upstart.rb

View Options

spec/unit/parser/scope_spec.rb

View Options

spec/unit/provider/service/upstart_spec.rb

Merge branch '2.7rc' into 2.7.x9758fdc59698UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (7)

rPU9758fdc59698

CHANGELOG

acceptance/tests/resource/service/ticket_14297_handle_upstart.rb

conf/redhat/puppet.spec

lib/puppet/parser/scope.rb

lib/puppet/provider/service/upstart.rb

spec/unit/parser/scope_spec.rb

spec/unit/provider/service/upstart_spec.rb

Merge branch '2.7rc' into 2.7.x
9758fdc59698Unpublished
Actions