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] Merge forward from 2019.2.0.rc1 to 2019.2 #51198

Merged
merged 36 commits into from Jan 17, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Jan 16, 2019

No conflicts

s0undt3ch and others added 30 commits Jan 7, 2019
This prevents closed resources from being reused.
Back-port PR #51084 to 2019.2.0.rc1
fix flakiness in create wake on lan test (2019.2)
Update man pages for 2019.2.0
 Update Fluorine references to 2019.2.0
Apparently there are some unicode sequences in the setup.py that cause
issues for some people.
Backport #51086 into 2019.2.0.rc1
Backport #51100 into 2019.2.0.rc1
Handle encoding when opening file for both py2/py3
[2019.2.0.rc1] Update to salt-bootstrap v2019.01.08
Update python to 2.7.15 and 3.5.4 for Windows installers
Fix mysql query test failure
Mark renderer test as flaky for mac tests
BrianSidebotham and others added 6 commits Dec 28, 2018
Backport #51000 into 2019.2.0rc1
Fix Python 3 incompatibility in EC2 salt-cloud driver
@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Jan 16, 2019
@Ch3LL Ch3LL merged commit 644ef8c into saltstack:2019.2 Jan 17, 2019
9 of 10 checks passed
9 of 10 checks passed
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
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 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/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
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2-rc branch Jan 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.