Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement no_block for service.running/service.dead (systemd only) #39632

Merged
merged 2 commits into from
Feb 24, 2017

Conversation

terminalmage
Copy link
Contributor

Resolves #39570.

@ghost
Copy link

ghost commented Feb 24, 2017

@terminalmage, thanks for your PR! By analyzing the history of the files in this pull request, we identified @thatch45, @kiorky and @robertkeizer to be potential reviewers.

python_shell=False,
ignore_recode=True) == 0
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this is an unrelated bugfix? Might be worth calling that out?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what you mean by "calling that out".

If you mean "mention it in the PR/commit msg", I don't think that's necessary since I opened #39633 to fix this in the 2016.3 release branch. I only made the change here because I also added a missing unit test, and I needed this fix here to make the test pass.

@lmb
Copy link

lmb commented Feb 24, 2017 via email

@terminalmage
Copy link
Contributor Author

Cool. Thanks for reviewing the PR, by the way. 😄

@cachedout
Copy link
Contributor

@terminalmage Could you rebase this please? Merge conflict.

@terminalmage
Copy link
Contributor Author

Rebased.

@cachedout cachedout merged commit aba4c29 into saltstack:develop Feb 24, 2017
@terminalmage terminalmage deleted the issue39570 branch April 25, 2017 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants