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

Revert "Back-port #50146 to 2018.3" #50231

Merged
merged 1 commit into from Oct 25, 2018

Conversation

Projects
None yet
1 participant
@rallytime
Copy link
Contributor

commented Oct 25, 2018

Reverts #50174

This change is causing about 90 salt-ssh tests to fail. Reverting for now so we can track this down better later.

@rallytime rallytime merged commit 1c8cdf9 into 2018.3 Oct 25, 2018

3 of 12 checks passed

continuous-integration/jenkins/branch This commit cannot be built
Details
License Compliance FOSSA is analyzing this commit
Details
jenkins/pr/docs Testing docs...
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py2-ubuntu-1604 running py2-ubuntu-1604...
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/lint The lint job has passed
Details

@rallytime rallytime deleted the revert-50174-bp-50146 branch Oct 25, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Oct 25, 2018

Refs #50146

rallytime added a commit to rallytime/salt that referenced this pull request Oct 25, 2018

Fix salt-cloud UnicodeEncodeError when writing to stdout
This is a partial back-port of saltstack#50146.

The full back-port was reverted due to the original change causing all
of the salt-ssh tests to fail.

This change fixes the salt-cloud error, but allows salt-ssh to work
correctly.

Refs saltstack#49523, saltstack#50146, saltstack#50174, saltstack#50231, and saltstack#50235
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.