Diffusion puppet 84df35dc5de1

Merge remote-tracking branch 'upstream/2.7rc' into 3.0rc
84df35dc5de1Unpublished
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/2.7rc' into 3.0rc

upstream/2.7rc: (#14297) Don't remove tty1 or rsyslog during upstart acceptance (#14297) Define agent in upstart acceptance test (#14297) Update upstart provider acceptance tests (#14297) Clean up upstart provider and tests (#14343) Test cases for more forms of variable lookup (#14297) Add acceptance test for upstart provider (#14297) Update spec tests for upstart provider (#14297) Handle upstart services better (#14343) Lookup in correct inherited scope (Maint) Added test for fully qualified variables Update CHANGELOG puppet.spec for 2.7.15rc2

Conflicts:
CHANGELOG
conf/redhat/puppet.spec
lib/puppet/parser/scope.rb
spec/unit/parser/scope_spec.rb

Details

Provenance

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

Parents

rPU13505c06276e: Merge remote-tracking branch 'haus/ticket/2.7rc/14297_handle_upstart_better'…
rPU0f83fb4a0215: Merge pull request #815 from…

Branches

Unknown

Tags

Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPU84df35dc5de1: Merge remote-tracking branch 'upstream/2.7rc' into 3.0rc (authored by Andrew Parker <andy@puppetlabs.com>).May 30 2012, 12:52 AM

Merged Changes

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
cfeb0138b980 Update CHANGELOG puppet.spec for 2.7.15rc2
Author
Moses Mendoza <moses@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

acceptance/

tests/

resource/

service/

ticket_14297_handle_upstart.rb

conf/

redhat/

lib/

puppet/

parser/

provider/

service/

spec/

integration/

parser/

unit/

provider/

service/

upstart_spec.rb

rPU84df35dc5de1

CHANGELOG

Loading...

acceptance/tests/resource/service/ticket_14297_handle_upstart.rb

Loading...

conf/redhat/puppet.spec

Loading...

lib/puppet/parser/scope.rb

Loading...

lib/puppet/provider/service/upstart.rb

Loading...

spec/integration/parser/scope_spec.rb

Loading...

spec/unit/provider/service/upstart_spec.rb

Loading...