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 #49571

Merged
merged 5 commits into from Sep 10, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Sep 7, 2018

No conflicts.

rallytime added some commits Sep 5, 2018

Skip service module integration tests on CentOS 7
These are occassionally killing the SSH connection in our Jenkins tests. Let's
skip them for now until we can delve more deeply into this.
Merge pull request #49549 from rallytime/codeowners-duplicate
Remove duplicate comment in CODEOWNERS file
@dwoz

dwoz approved these changes Sep 7, 2018

@rallytime rallytime merged commit 9004422 into saltstack:2018.3 Sep 10, 2018

5 of 10 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-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 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
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 10, 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.