Diffusion puppet d97e33efff86

3757-agent-lockfiles' from cprice
d97e33efff86Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge 'puppet-feature/master/3757-agent-lockfiles' from cprice

This manually fixes the minor merge conflict by hand.

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Details

Provenance

Daniel Pittman <daniel@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUd1f7abd7c4bc: (#3757) add acceptance test
rPUb20511164b5e: Merge pull request #711 from…

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPUd97e33efff86: Merge 'puppet-feature/master/3757-agent-lockfiles' from cprice (authored by Daniel Pittman <daniel@puppetlabs.com>).Apr 25 2012, 11:14 PM

Merged Changes

d1f7abd7c4bc (#3757) add acceptance test
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
c1d8a3e13035 (#3757) cleanup and docs
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b00e7e9befa (#3757) Implement json-based lockfiles
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
7484b8aff28c (#3757) rename AnonymousFilelock to JsonFilelock
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
93c9217ab40a (#3757) Remove 'anonymous' functionality from lockfiles
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
46b654677659 (#3757) move lockfile path logic into modules
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
a57bc0e248c2 (#3757) separate settings for agent lockfile paths
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
ee97771d29b7 (#3757, #12934) Minor test improvement for agent disable message
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
af12688a3224 (#3757) re-introduce lockfile changes
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (20)

Path

Size

acceptance/

tests/

agent

	agent/
	pluginsync/

	agent_disable_lockfile.rb
	7316_apps_should_be_available_via_pluginsync.rb

lib/

puppet/

agent/

application/

util/

spec/

unit/

agent/

disabler_spec.rb

locker_spec.rb

agent_backward_compatibility_spec.rb

agent_spec.rb

application/

agent_spec.rb

configurer_spec.rb

util/

json_lockfile_spec.rb

lockfile_spec.rb

pidlock_spec.rb

rPUd97e33efff86

View Options

acceptance/tests/agent/agent_disable_lockfile.rb

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/configurer.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/util/json_lockfile.rb

View Options

lib/puppet/util/lockfile.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_backward_compatibility_spec.rb

View Options

spec/unit/agent_spec.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/configurer_spec.rb

View Options

spec/unit/util/json_lockfile_spec.rb

View Options

spec/unit/util/lockfile_spec.rb

View Options

spec/unit/util/pidlock_spec.rb

Merge 'puppet-feature/master/3757-agent-lockfiles' from cpriced97e33efff86UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (20)

rPUd97e33efff86

acceptance/tests/agent/agent_disable_lockfile.rb

lib/puppet/agent.rb

lib/puppet/agent/disabler.rb

lib/puppet/agent/locker.rb

lib/puppet/application/agent.rb

lib/puppet/configurer.rb

lib/puppet/defaults.rb

lib/puppet/util/json_lockfile.rb

lib/puppet/util/lockfile.rb

lib/puppet/util/pidlock.rb

spec/unit/agent/disabler_spec.rb

spec/unit/agent/locker_spec.rb

spec/unit/agent_backward_compatibility_spec.rb

spec/unit/agent_spec.rb

spec/unit/application/agent_spec.rb

spec/unit/configurer_spec.rb

spec/unit/util/json_lockfile_spec.rb

spec/unit/util/lockfile_spec.rb

spec/unit/util/pidlock_spec.rb

Merge 'puppet-feature/master/3757-agent-lockfiles' from cprice
d97e33efff86Unpublished
Actions