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

[2019.2] Fix supervisord #52513

Merged
merged 1 commit into from Apr 11, 2019

Conversation

@dwoz
Copy link
Contributor

commented Apr 11, 2019

Prefix any output with ERROR on non 0 exit code because that's what the
supervisord state checks for.

What does this PR do?

Cherry-pick supervisord test fix from 2017.7

#52462

Tests written?

No - Fixing tests

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Prefix any output with ERROR on non 0 exit code because that's what the
supervisord state checks for.
@dwoz dwoz changed the title [2018.3] Fix supervisord [2019.2] Fix supervisord Apr 11, 2019
@Ch3LL
Ch3LL approved these changes Apr 11, 2019
@dwoz dwoz merged commit 1532642 into saltstack:2019.2 Apr 11, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.