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

[2017.7] Merge forward from 2017.7.8 to 2017.7 #48988

Merged
merged 8 commits into from Aug 8, 2018

Conversation

Projects
None yet
2 participants
@rallytime
Contributor

rallytime commented Aug 8, 2018

No conflicts.

rallytime and others added some commits Aug 7, 2018

Merge pull request #48968 from rallytime/man-pages
Update man pages for 2017.7.8 release
Skip unreliable tornado tests
Marked as flaky originally, but they're still flaky with undetermined
race-conditions. These are skipped in 2018.3 and forward, so let's skip
them here as well.
Merge pull request #48976 from rallytime/tornado
Skip unreliable tornado tests

@rallytime rallytime merged commit 51eed1f into saltstack:2017.7 Aug 8, 2018

3 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
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
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2017.7 branch Aug 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment