2.7.x - merge 2.6.x branch up#334
Merged
jeffmccune merged 4 commits intopuppetlabs:2.7.xfrom Jan 13, 2012
slippycheeze:feature/2.7.x/merge-2.6.x-branch
Merged
2.7.x - merge 2.6.x branch up#334jeffmccune merged 4 commits intopuppetlabs:2.7.xfrom slippycheeze:feature/2.7.x/merge-2.6.x-branch
jeffmccune merged 4 commits intopuppetlabs:2.7.xfrom
slippycheeze:feature/2.7.x/merge-2.6.x-branch
Conversation
The Puppet::Daemon instance sets up the pid file when it starts but it's up to the user of that object to arrange for stop to be called There are signal handlers setup to call stop but in a onetime run those are never called This change arrange for the stop method to be called after a onetime run is done but do not hand the task of exiting the application over to that so that the agent application can handle the report status based exit codes
(#5246) Puppetd does not remove it's pidfile when it exits
The 2.6 spec tests didn't catch the SystemExit exception thrown by the call to Kernel#exit in the one-time agent, while the 2.7 branch demands that. This adds the extra expectation to ensure that the specs pass. Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
jeffmccune
pushed a commit
that referenced
this pull request
Jan 13, 2012
…-branch 2.7.x - merge 2.6.x branch up
hlindberg
pushed a commit
to hlindberg/puppet
that referenced
this pull request
Oct 16, 2014
Fix for document 105
melissa
pushed a commit
to melissa/puppet
that referenced
this pull request
Mar 30, 2018
(PCP-293 & PCP-294)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merges the changes on the 2.6.x branch up into the 2.7.x branch, including a hand-merge correcting an additional failure in the spec tests due to
SystemExitneeding to be caught in the newer branch.