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 #49943 to 2018.3 #50052

Merged
merged 3 commits into from Oct 15, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Oct 15, 2018

Back-port #49943 to 2018.3

thetaurean added some commits Oct 8, 2018

Coerce string when calling compile_template_str
Previously on python3 this would otherwise pass bytes (unhandled)
Handle non-ASCII chars during template data decode
Change requested by terminalmage, line 255.

@rallytime rallytime requested a review from saltstack/team-core as a code owner Oct 15, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Oct 15, 2018

@rallytime rallytime merged commit b26b21c into saltstack:2018.3 Oct 15, 2018

7 of 10 checks passed

jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
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/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
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

@rallytime rallytime deleted the rallytime:bp-49943 branch Oct 15, 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.