Diffusion puppet 7ff584fe4995

Merge branch 'stable'
7ff584fe4995Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

stable: (PUP-2364) Correct host variable reference (PUP-2364) Fix usage of puppet vardir setting Win2003 (PUP-2635) Skip this test on windows (PUP-2635) integration test for the purging of authorized ssh keys (PUP-2635) use generate instead of eval_generate to purge ssh keys (maint) Use same prioritizer throughout catalog

Details

Provenance

Rob Reynolds <ferventcoder@gmail.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU2d6948df1436: (PUP-2364) Correct host variable reference
rPU482cd2dd488a: Merge branch 'ticket/master/PUP-837-FFI-Windows-SID'

Branches

Unknown

Tags

Unknown

Event Timeline

Rob Reynolds <ferventcoder@gmail.com> committed rPU7ff584fe4995: Merge branch 'stable' (authored by Rob Reynolds <ferventcoder@gmail.com>).Jun 6 2014, 5:34 PM

Merged Changes

2d6948df1436 (PUP-2364) Correct host variable reference
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
356fb576401a Merge pull request #2743 from Iristyle/ticket/stable/PUP-2364-fix-vardir…
Author
Kurt Wall <kurt.wall@puppetlabs.com>
Browse Repository
No Builds
No Audits
192a2d038e80 (PUP-2364) Fix usage of puppet vardir setting Win2003
Author
Iristyle <Iristyle@github>
Browse Repository
No Builds
No Audits
be96256a9ca2 Merge pull request #2739 from zaphod42/maint/stable/allow-prioritizer-to-be…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
0ee1aadc3d10 (PUP-2635) Skip this test on windows
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
9c2aa2c98ac0 Merge pull request #2707 from ffrank/ticket/3.6.1/PUP-2635-issues-with-ssh-key…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
ebec527354a1 (PUP-2635) integration test for the purging of authorized ssh keys
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
fa1f1ad199e5 (PUP-2635) use generate instead of eval_generate to purge ssh keys
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
95ddc53035b5 (maint) Use same prioritizer throughout catalog
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

acceptance/

tests/

environment/

use_enc_environment_for_pluginsync.rb

pluginsync/

files_earlier_in_modulepath_take_precendence.rb

ticket_6541_invalid_filebucket_files.rb

ticket_6734_6256_5530_5503.rb

ticket_9862_puppet_runs_without_service_user_or_group_present.rb

lib/

puppet/

resource/

type/

spec/

integration/

type/

unit/

type/

rPU7ff584fe4995

acceptance/tests/environment/use_enc_environment_for_pluginsync.rb

Loading...

acceptance/tests/pluginsync/files_earlier_in_modulepath_take_precendence.rb

Loading...

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

Loading...

acceptance/tests/ticket_6734_6256_5530_5503.rb

Loading...

acceptance/tests/ticket_9862_puppet_runs_without_service_user_or_group_present.rb

Loading...

lib/puppet/resource/catalog.rb

Loading...

lib/puppet/transaction.rb

Loading...

lib/puppet/type/user.rb

Loading...

spec/integration/type/user_spec.rb

Loading...

spec/unit/type/user_spec.rb

Loading...