Merge branch '2.7rc' into 2.7.x
3c422310c05eUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7rc' into 2.7.x

Details

Provenance

Matthaus Litteken <matthaus@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU6cb069012a3f: Updating CHANGELOG for 2.7.12rc2
rPUa3dddd93411c: Merge pull request #552 from nicklewis/ticket/2.7.x/11988

Branches

Unknown

Tags

Unknown

Event Timeline

Matthaus Litteken <matthaus@puppetlabs.com> committed rPU3c422310c05e: Merge branch '2.7rc' into 2.7.x (authored by Matthaus Litteken <matthaus@puppetlabs.com>).Mar 3 2012, 8:55 PM

Merged Changes

6cb069012a3f Updating CHANGELOG for 2.7.12rc2
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
21cdab1c8281 (#7592) Remove redundant call to String#to_s
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
5474941f2735 (#11988) Work around Augeas reload bug when changing save modes
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
f4d9753c7ea9 (#11988) Don't overwrite symlinks in augeas provider
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
c085327ada08 (#8312) Fix zypper provider so ensure => 'latest' now works
Author
Ken Barber <ken@bob.sh>
Browse Repository
No Builds
No Audits
5bf45d5e1bf6 Merge pull request #559 from cprice-puppet/bug/2.7.x/12844-agent-enable-doesnt…
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
28d5d9b3779e (#12844) Fix a unit test relating to lockfiles
Author
cprice <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
a3e0e82070b3 Merge pull request #556 from joshcooper/ticket/2.7.x/12914-poll-child
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
62738187b8a1 Merge pull request #551 from cprice-puppet/bug/2.7.x/12844-agent-enable-doesnt…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
1d058ce233ae (#12914) Allow puppet to be interrupted while waiting for child
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
8f626d00ebe8 (#12933) Better error message when agent is administratively disabled
Author
cprice <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
30855bddaaf8 (#12844) Agent lockfiles: backwards compatibility with 2.7.10/2.7.11
Author
cprice <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
51a3090d9348 Merge pull request #542 from jeffmccune/ticket/2.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
bcbe2a3753e4 Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x"
Author
cprice <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
95810adfeae6 Revert "(#12844) Backwards compatibility for 'puppet agent --enable'"
Author
cprice <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
46903a3690e7 Merge pull request #540 from cprice-puppet/bug/2.7.x/12844-agent-enable-doesnt…
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
2d8d9ceff863 (#12881) Fix cron type default name error on windows
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
fcac8f7163c9 (#12844) Backwards compatibility for 'puppet agent --enable'
Author
cprice <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

CHANGELOG

lib/

puppet/

agent/

application/

type/

util/

anonymous_filelock.rb

pidlock.rb

windows/

process.rb

spec/

unit/

agent/

disabler_spec.rb

locker_spec.rb

agent_backward_compatibility_spec.rb

agent_spec.rb

application/

agent_spec.rb

type/

cron_spec.rb

util/

anonymous_filelock_spec.rb

pidlock_spec.rb

test/

util/

pidlock.rb

rPU3c422310c05e

View Options

CHANGELOG

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/type/cron.rb

View Options

lib/puppet/util/anonymous_filelock.rb

View Options

lib/puppet/util/pidlock.rb

View Options

lib/puppet/util/windows/process.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/type/cron_spec.rb

View Options

spec/unit/util/anonymous_filelock_spec.rb

View Options

spec/unit/util/pidlock_spec.rb

View Options

Merge branch '2.7rc' into 2.7.x3c422310c05eUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (18)

rPU3c422310c05e

CHANGELOG

lib/puppet/agent.rb

lib/puppet/agent/disabler.rb

lib/puppet/agent/locker.rb

lib/puppet/application/agent.rb

lib/puppet/type/cron.rb

lib/puppet/util/anonymous_filelock.rb

lib/puppet/util/pidlock.rb

lib/puppet/util/windows/process.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/type/cron_spec.rb

spec/unit/util/anonymous_filelock_spec.rb

spec/unit/util/pidlock_spec.rb

test/util/pidlock.rb

Merge branch '2.7rc' into 2.7.x
3c422310c05eUnpublished
Actions