Diffusion puppet f09b2a9f4631

Merge branch '2.6.x' into 2.7.x
f09b2a9f4631Unpublished
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: Updates for 2.6.11 (#9793) "secure" indirector file backed terminus base class. (#9792) Predictable temporary filename in ralsh. Drop privileges before creating and chmodding SSH keys. (#9794) k5login can overwrite arbitrary files as root (#9794) k5login can overwrite arbitrary files as root Updated CHANGELOG for 2.6.10 Update spec and lib/puppet.rb for 2.6.10 release Resist directory traversal attacks through indirections. Resist directory traversal attacks through indirections. (9547) Minor mods to acceptance tests

Conflicts (resolved manually):
CHANGELOG
conf/redhat/puppet.spec
lib/puppet.rb
lib/puppet/application/resource.rb
lib/puppet/indirector.rb

Details

Provenance

Max Martin <max@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU3cfd39b1907d: Merge branch '2.6rc' into 2.6.x
rPU24d6c518e167: Merge branch 'maint/2.7.x/resource_app_cleanup' into 2.7.x

Branches

Unknown

Tags

Unknown

Event Timeline

Max Martin <max@puppetlabs.com> committed rPUf09b2a9f4631: Merge branch '2.6.x' into 2.7.x (authored by Max Martin <max@puppetlabs.com>).Oct 3 2011, 8:42 PM

Merged Changes

3cfd39b1907d Merge branch '2.6rc' into 2.6.x
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
2bf8004b05d7 Updates for 2.6.11
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
e158b262dbe1 (#9793) "secure" indirector file backed terminus base class.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
343c7bd381b6 (#9792) Predictable temporary filename in ralsh.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
88512e880bd2 Drop privileges before creating and chmodding SSH keys.
Author
Ricky Zhou <ricky@fedoraproject.org>
Browse Repository
No Builds
No Audits
2775c21ae48e (#9794) k5login can overwrite arbitrary files as root
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
e7a69952c052 (#9794) k5login can overwrite arbitrary files as root
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
408d117e7d6b Updated CHANGELOG for 2.6.10
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec5a32ae9cb4 Update spec and lib/puppet.rb for 2.6.10 release
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
fe2de817b43a Resist directory traversal attacks through indirections.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
0a92a70a22b7 Resist directory traversal attacks through indirections.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
4a37529b7d59 Merge pull request #121 from djm68/9547_accectance_tests_cleanup_cfgs
Author
Dan Bode <dan@bodepd.com>
Browse Repository
No Builds
No Audits
8d86e5a421ee (9547) Minor mods to acceptance tests
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

acceptance/

tests/

resource/

service/

ticket_4123_should_list_all_running_redhat.rb

ticket_4124_should_list_all_disabled.rb

ticket_6857_password-disclosure-when-changing-a-users-password.rb

conf/

redhat/

lib/

puppet/

rPUf09b2a9f4631

CHANGELOG

Loading...

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

Loading...

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

Loading...

acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb

Loading...

conf/redhat/puppet.spec

Loading...

lib/puppet/indirector.rb

Loading...