Merge branch '2.7.x'
66d852bb2c2bUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Conflicts:
lib/puppet/provider/augeas/augeas.rb
spec/unit/node_spec.rb

Details

Provenance

Nick Lewis <nick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU1049458461b5: Merge branch 'ticket/2.7.x/5495' into 2.7.x
rPU39116d4a6ed4: maint: Fix order dependent spec failure

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPU66d852bb2c2b: Merge branch '2.7.x' (authored by Nick Lewis <nick@puppetlabs.com>).Aug 16 2011, 8:45 PM

Merged Changes

1049458461b5 Merge branch 'ticket/2.7.x/5495' into 2.7.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
b28bcb031346 (#5495) Remove dead Windows-specific code from posix exec provider
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
c9c331bda6f4 Merge pull request #40 from jhelwig/fix-order-dependent-terminus-tests-in-2.7.x
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
b3e7f7b14111 Merge pull request #39 from nfagerlund/ticket/2.7.x/8612_exec_creates_parameter
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2297899e76dd Do not leak indirector state from apply tests
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
b52fbf4e3c8c (#8612) Clarify the function of the example for exec's "creates" parameter
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
1ce2973e8af2 Merge pull request #22 from domcleal/tickets/2.7.x/8808
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
344aef91a358 (#8808) Fail Augeas resource when unable to save changes
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

lib/

puppet/

provider/

exec/

posix.rb

type/

exec.rb

spec/

integration/

node_spec.rb

unit/

application/

apply_spec.rb

node_spec.rb

provider/

exec/

posix_spec.rb

rPU66d852bb2c2b

View Options

lib/puppet/provider/exec/posix.rb

View Options

lib/puppet/type/exec.rb

View Options

spec/integration/node_spec.rb

View Options

spec/unit/application/apply_spec.rb

View Options

spec/unit/node_spec.rb

View Options

spec/unit/provider/exec/posix_spec.rb

Merge branch '2.7.x'66d852bb2c2bUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (6)

rPU66d852bb2c2b

lib/puppet/provider/exec/posix.rb

lib/puppet/type/exec.rb

spec/integration/node_spec.rb

spec/unit/application/apply_spec.rb

spec/unit/node_spec.rb

spec/unit/provider/exec/posix_spec.rb

Merge branch '2.7.x'
66d852bb2c2bUnpublished
Actions