Diffusion puppet ba80b0e9fad2

Merge branch '2.7.x'
ba80b0e9fad2Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

2.7.x: Revert "Fix incorrect argument handling for expire in NodeExpirer" Fix #14123 for Windows Fix incorrect argument handling for expire in NodeExpirer Fix filebucket specs on Windows (#8778) Make '' == undef commutative in the DSL (#14173) Enforce that filebucket paths must be absolute (#14127) Add integration tests for ssh_authorized_key maint: refactor integration specs for ssh_authorized_key (#14127) ssh_authorized_keys grammer fails on blank lines. (#14123) Puppet shouldn't explode if PATH contains ~nonexistent_user

Conflicts:
lib/puppet/provider/ssh_authorized_key/parsed.rb
lib/puppet/util.rb

Details

Provenance

Patrick Carlisle <patrick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUd2b3ba06594d: Revert "Fix incorrect argument handling for expire in NodeExpirer"
rPU685191f85159: Merge pull request #718 from…

Branches

Unknown

Tags

Unknown

Event Timeline

Patrick Carlisle <patrick@puppetlabs.com> committed rPUba80b0e9fad2: Merge branch '2.7.x' (authored by Patrick Carlisle <patrick@puppetlabs.com>).May 1 2012, 11:07 PM

Merged Changes

d2b3ba06594d Revert "Fix incorrect argument handling for expire in NodeExpirer"
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
978cc15970f3 Merge pull request #728 from pcarlisle/maint/2.7.x/post-facts
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
ac7bd6b28a2b Merge pull request #701 from daniel-pittman/bug/2.7.x/14127-ssh-auth-keys-fails…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
960f017e5e0a Merge pull request #1 from stschulte/ticket/2.7.x/14127_2
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
6adb2c97168b Merge pull request #729 from pcarlisle/baduser-windows
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
7c7d4b690c25 Fix #14123 for Windows
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
1c9bec019e08 Fix incorrect argument handling for expire in NodeExpirer
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7e92a7c416f3 Fix filebucket specs on Windows
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
36e92f2fad0c Merge pull request #700 from daniel-pittman/bug/2.7.x/14123-don't-explode-when…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7f0ef4aaa166 Merge pull request #713 from daniel-pittman/bug/2.7.x/14173-filebucket-resource…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7af59dea8e6e Merge branch 'ticket/2.7.x/8778_equality_in_puppet_is_not_commutative' into 2.7.
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
a713f07a63cb (#8778) Make '' == undef commutative in the DSL
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
603b368a46a7 (#14173) Enforce that filebucket paths must be absolute
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
402a425d9d26 (#14127) Add integration tests for ssh_authorized_key
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
85ee4412d212 maint: refactor integration specs for ssh_authorized_key
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
b4d1c654320e (#14127) ssh_authorized_keys grammer fails on blank lines.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
36d959a31861 (#14123) Puppet shouldn't explode if PATH contains ~nonexistent_user
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

lib/

puppet/

parser/

provider/

ssh_authorized_key/

type/

spec/

integration/

provider/

ssh_authorized_key_spec.rb

unit/

parser/

ast/

provider/

ssh_authorized_key/

type/

filebucket_spec.rb

rPUba80b0e9fad2

lib/puppet/parser/ast.rb

Loading...

lib/puppet/provider/ssh_authorized_key/parsed.rb

Loading...

lib/puppet/type/filebucket.rb

Loading...

lib/puppet/util.rb

Loading...

spec/integration/provider/ssh_authorized_key_spec.rb

Loading...

spec/unit/parser/ast/leaf_spec.rb

Loading...

spec/unit/parser/ast_spec.rb

Loading...

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

Loading...

spec/unit/type/filebucket_spec.rb

Loading...

spec/unit/util_spec.rb

Loading...