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

Fix bad merge conflict resolution #50120

Merged
merged 1 commit into from Oct 19, 2018

Conversation

Projects
None yet
4 participants
@terminalmage
Copy link
Contributor

commented Oct 18, 2018

b98df6d was incorrectly merged forward into 2018.3 (or into develop, before 2018.3 was branched). This causes failures to redeploy the thin tarball when it has changed, under certain circumstances.

This commit fixes the problem. I'm also leaving in some changes to the logging that I made in the course of troubleshooting this, as they make the border between stdout and stderr more explicit, as well as adding the shim command's retcode.

Fixes saltstack/salt-jenkins#1137.

Fix bad merge conflict resolution
b98df6d was incorrectly merged forward into 2018.3 (or into develop,
before 2018.3 was branched). This causes failures to redeploy the thin
tarball when it has changed, under certain circumstances.

This commit fixes the problem. I'm also leaving in some changes to the
logging that I made in the course of troubleshooting this, as they make
the border between stdout and stderr more explicit, as well as adding
the shim command's retcode.
@isbm

isbm approved these changes Oct 18, 2018

Copy link
Contributor

left a comment

@terminalmage ohwell, happens. @Ch3LL don't give up! 😉

@cachedout cachedout merged commit 35449b4 into saltstack:2018.3 Oct 19, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job 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/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:salt-jenkins-1137 branch Oct 19, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.