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

Back-port #50146 to 2018.3 #50174

Merged
merged 1 commit into from Oct 23, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Oct 23, 2018

Back-port #50146 to 2018.3

@rallytime rallytime merged commit 5f904dd into saltstack:2018.3 Oct 23, 2018

4 of 10 checks passed

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

@rallytime rallytime deleted the rallytime:bp-50146 branch Oct 23, 2018

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.