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

[develop] Merge forward from 2017.7 to 2018.8 #50737

Merged
merged 14 commits into from Dec 4, 2018

Conversation

Projects
None yet
4 participants
@garethgreenaway
Copy link
Member

commented Dec 4, 2018

Conflicts:
tests/support/case.py

astronouth7303 and others added some commits Nov 26, 2018

Mike Place
Mike Place
Merge pull request #50702 from damon-atkins/jenkins_pylint
Fixes/Improvements to ci/lint.
Merge pull request #50718 from dwoz/run_run_timeout
Honor run_run timeout for shell tests
Merge branch '2017.7' into merge-2017.7
 Conflicts:
	tests/support/case.py

@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Dec 4, 2018

@dwoz

dwoz approved these changes Dec 4, 2018

@dwoz dwoz merged commit ae81498 into saltstack:2018.3 Dec 4, 2018

10 checks passed

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/py2-windows-2016 The py2-windows-2016 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
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.