3757' into 2.7.x
86a806f595f8Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x

masterzen/tickets/2.7.x/3757: (#4836) - Agent --disable should allow to put a message (#3757) - Refactor enable/disable to its own module (#3757) - Move enable/disable to its own lock

Details

Provenance

Jacob Helwig <jacob@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU0ffe1acc9221: (#4836) - Agent --disable should allow to put a message
rPUac81771a9cc7: Merge branch 'tickets/2.7.x/11414' of https://github.com/domcleal/puppet into…

Branches

Unknown

Tags

Unknown

Reverted By

rPUbcbe2a3753e4: Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x"

Event Timeline

Jacob Helwig <jacob@puppetlabs.com> committed rPU86a806f595f8: Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x (authored by Jacob Helwig <jacob@puppetlabs.com>).Dec 30 2011, 8:07 PM

Diffusion added a reverting change: rPUbcbe2a3753e4: Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x".Jun 2 2015, 3:07 PM

Merged Changes

0ffe1acc9221 (#4836) - Agent --disable should allow to put a message
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
7777d91da0e7 (#3757) - Refactor enable/disable to its own module
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
b434e3b9c31d (#3757) - Move enable/disable to its own lock
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

lib/

puppet/

agent/

application/

util/

anonymous_filelock.rb

pidlock.rb

spec/

unit/

agent/

application/

util/

anonymous_filelock_spec.rb

pidlock_spec.rb

test/

util/

pidlock.rb

rPU86a806f595f8

View Options

lib/puppet/agent.rb

View Options

lib/puppet/agent/disabler.rb

View Options

lib/puppet/agent/locker.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/util/anonymous_filelock.rb

View Options

lib/puppet/util/pidlock.rb

View Options

spec/unit/agent/disabler_spec.rb

View Options

spec/unit/agent/locker_spec.rb

View Options

spec/unit/agent_spec.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/util/anonymous_filelock_spec.rb

View Options

spec/unit/util/pidlock_spec.rb

View Options

Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x86a806f595f8UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (13)

rPU86a806f595f8

lib/puppet/agent.rb

lib/puppet/agent/disabler.rb

lib/puppet/agent/locker.rb

lib/puppet/application/agent.rb

lib/puppet/util/anonymous_filelock.rb

lib/puppet/util/pidlock.rb

spec/unit/agent/disabler_spec.rb

spec/unit/agent/locker_spec.rb

spec/unit/agent_spec.rb

spec/unit/application/agent_spec.rb

spec/unit/util/anonymous_filelock_spec.rb

spec/unit/util/pidlock_spec.rb

test/util/pidlock.rb

Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x
86a806f595f8Unpublished
Actions