Diffusion puppet 66d0b16c8a0a

Merge branch '2.6.next' into next
66d0b16c8a0aUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' into next

2.6.next: Fixed #6562 - Minor kick documentation fix (#6658) Propagate ENC connection errors to the agent (#4884) Remove typo from spec test (#4884) Modify tests to pass on non-OS X systems (#4884) Revise new exec tests, add a few more (#4884) Add an shell provider for execs (#4884) Fix Test::Unit exec tests (#4884) Break the exec type out to have a posix provider (#4884) Add consistent path validation and behavior (#4884) Add expand_path to requiring the spec_helper (#4884) Autorequire shared behaviors and method to silence warnings (#4884) Fix whitespace (#4884) Get rid of open3 require since it wasn't being used (#5814) Improved cron type specs (#5814) cron_spec shouldn't depend on cron provider

Manually Resolved Conflicts:
lib/puppet/util/command_line/puppetrun
spec/spec_helper.rb
spec/unit/type/exec_spec.rb
spec/unit/type_spec.rb
test/ral/type/exec.rb

Details

Provenance

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

Parents

rPU3875b5ba9014: Merge branch 'tickets/2.6.x/6562' into 2.6.next
rPU36f4dc5e1527: Merge branch 'ticket/next/6820_ruby19_fixes' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU66d0b16c8a0a: Merge branch '2.6.next' into next (authored by Max Martin <max@puppetlabs.com>).Mar 23 2011, 10:32 PM

Merged Changes

3875b5ba9014 Merge branch 'tickets/2.6.x/6562' into 2.6.next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
a29c7fd408b8 Fixed #6562 - Minor kick documentation fix
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
696ba50accc6 Merge branch 'ticket/2.6.next/6658' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
df2051312235 (#6658) Propagate ENC connection errors to the agent
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fa2010b13835 Merge branch 'ticket/2.6.x/5814' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
137f1eacb2cd Merge branch 'ticket/2.6.next/maint-more-exec-testing' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
08115c074202 (#4884) Remove typo from spec test
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
a1d32fb0e29d Merge branch 'ticket/2.6.next/maint-fix-exec-tests' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
f2c771be3997 (#4884) Modify tests to pass on non-OS X systems
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
462a56060f0f Merge branch 'feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered…
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec1aa192825f (#4884) Revise new exec tests, add a few more
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
0d2d6f3f005e (#4884) Add an shell provider for execs
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d2e911a1f9da (#4884) Fix Test::Unit exec tests
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fa0cfc60ccf4 (#4884) Break the exec type out to have a posix provider
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
c86a980fe9b2 (#4884) Add consistent path validation and behavior
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
77fbf7fdd3d1 (#4884) Add expand_path to requiring the spec_helper
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
7ec90576d396 (#4884) Autorequire shared behaviors and method to silence warnings
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
acc99ba8f87c (#4884) Fix whitespace
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
6a4d291fa72a (#4884) Get rid of open3 require since it wasn't being used
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fddc16535b16 (#5814) Improved cron type specs
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
f2dfee6e2f87 (#5814) cron_spec shouldn't depend on cron provider
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

lib/

puppet/

indirector/

parameter/

provider/

exec/

type/

spec/

integration/

transaction_spec.rb

lib/

puppet_spec/

shared_behaviours/

path_parameters.rb

unit/

indirector/

parameter/

provider/

exec/

type/

test/

ral/

type/

rPU66d0b16c8a0a

lib/puppet/indirector/exec.rb

Loading...

lib/puppet/parameter.rb

Loading...

lib/puppet/parameter/path.rb

Loading...

lib/puppet/provider/exec/posix.rb

Loading...

lib/puppet/provider/exec/shell.rb

Loading...

lib/puppet/type/exec.rb

Loading...

spec/integration/transaction_spec.rb

Loading...

spec/lib/puppet_spec/verbose.rb

Loading...

spec/shared_behaviours/path_parameters.rb

Loading...

spec/spec_helper.rb

Loading...

spec/unit/indirector/exec_spec.rb

Loading...

spec/unit/parameter/path_spec.rb

Loading...

spec/unit/provider/exec/posix_spec.rb

Loading...

spec/unit/provider/exec/shell_spec.rb

Loading...

spec/unit/type/cron_spec.rb

Loading...

spec/unit/type/exec_spec.rb

Loading...

test/ral/type/exec.rb

Loading...