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

[2018.3] Merge forward from 2017.7 to 2018.3 #52189

Merged
merged 16 commits into from Mar 15, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Mar 14, 2019

No conflicts

dwoz and others added 15 commits Feb 25, 2019
Fix typo in docstring
[2017.7] Nox fixes
Bring the Nox changes from 2017.7.9 to 2017.7
No conflicts.
@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Mar 14, 2019
@Ch3LL Ch3LL merged commit 0383ac3 into saltstack:2018.3 Mar 15, 2019
6 of 9 checks passed
6 of 9 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/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
@Ch3LL Ch3LL deleted the Ch3LL:merge-2018.3 branch Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.