puppetlabs/puppet — pull request #550 by cprice-puppet (2012-03-02 20:11:18+00:00)
Title: Bug/2.7.x/12844 agent enable doesnt remove old lockfile

This pull request handles the initial issues around lockfiles (ticket #12844). I'm still planning to add another commit to deal with ticket #11057, so it's probably best not to merge this yet. I just wanted to get it up here so that folks could get a head start on reviewing, and so that if the clock runs out for the 2.7.12rc tag this stuff will be available.

It will probably be easier to review this request by commits rather than as a whole.

The first commit backs out the initial backward-compatibility patch for #12844, which did not address mcollective compatibility concerns.

The second commit backs out the original merge that changed the agent lockfile behavior, which is what caused the mcollective compatibility concerns. Reverting this affects tickets #3757, #11057, and #4836.

The third commit provides backward compatibility between 2.7.12+ and 2.7.10/2.7.11 with regards to the agent lockfiles.

Planned forthcoming fourth commit will address ticket #11057.