Diffusion puppet 3a3a5100305a

Merge branch '2.6.x' into 2.7.x
3a3a5100305aUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.x' into 2.7.x

2.6.x: Reset indirector state after configurer tests. (#8770) Don't fail to set supplementary groups when changing user to root (#8770) Always fully drop privileges when changing user (#8662) Migrate suidmanager test case to rspec (#8740) Do not enumerate files in the root directory. (#3553) Explain that cron resources require time attributes

Conflicts:
lib/puppet/application/resource.rb
test/puppet/tc_suidmanager.rb

Details

Provenance

Jacob Helwig <jacob@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUe4bb85af3216: Merge pull request #41 from jhelwig/do-not-leak-indirector-state-2.6.x
rPU020c47645c7d: Merge pull request #43 from domcleal/tickets/2.7.x/9039

Branches

Unknown

Tags

Unknown

Event Timeline

Jacob Helwig <jacob@puppetlabs.com> committed rPU3a3a5100305a: Merge branch '2.6.x' into 2.7.x (authored by Jacob Helwig <jacob@puppetlabs.com>).Aug 17 2011, 8:41 PM

Merged Changes

e4bb85af3216 Merge pull request #41 from jhelwig/do-not-leak-indirector-state-2.6.x
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2bf6721a35a0 Reset indirector state after configurer tests.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
b6895de42276 Merge remote-tracking branch 'nicklewis/ticket/2.6.x/8770' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
bb224dd15498 (#8770) Don't fail to set supplementary groups when changing user to root
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7de5ee899621 Merge remote-tracking branch 'nicklewis/ticket/2.6.x/8770' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
75786ada2187 Merge pull request #32 from joshcooper/ticket/2.6.x/8740-cannot-manage-files-of…
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
2a0de12af530 (#8770) Always fully drop privileges when changing user
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
00c4b2501006 (#8662) Migrate suidmanager test case to rspec
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d7c9c765dbf2 (#8740) Do not enumerate files in the root directory.
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
f7e96953b4e2 Merge pull request #28 from nfagerlund/ticket/2.6.x/3553_cron_requires_time
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
0e0047393f86 (#3553) Explain that cron resources require time attributes
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

acceptance/

tests/

resource/

file/

ticket_8740_should_not_enumerate_root_directory.rb

lib/

puppet/

application/

type/

util/

spec/

unit/

application/

resource_spec.rb

configurer_spec.rb

type/

util/

suidmanager_spec.rb

test/

puppet/

tc_suidmanager.rb

rPU3a3a5100305a

acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb

Loading...

lib/puppet/application/resource.rb

Loading...

lib/puppet/type/cron.rb

Loading...

lib/puppet/type/file.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/suidmanager.rb

Loading...

spec/unit/application/resource_spec.rb

Loading...

spec/unit/configurer_spec.rb

Loading...

spec/unit/type/file_spec.rb

Loading...

spec/unit/util/suidmanager_spec.rb

Loading...

test/puppet/tc_suidmanager.rb

Loading...