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

Merged
merged 10 commits into from Oct 4, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Oct 4, 2018

No conflicts.

twangboy and others added some commits Sep 21, 2018

Populate changes dictionary
Fix docs formatting
Clean up code
Use explicit function calls
Add comment about reboot status
Actually catch the exception when we fail
This should actually cause builds to fail when any part in the try block
fails. We still delete instances and try junit rendering, but if things
fail then they get marked on github as failed.
Merge pull request #49870 from KaiSforza/ci_actually_fail
Actually catch the exception when we fail
Move vagrant to it's own group
Better support for ec2 on laptops that also have vagrant installed.
Use dwoz/winrm-fs for chunked downloads
Revert this after there is an upstream release
Merge pull request #49739 from twangboy/fix_49660
Populate changes dictionary on system.join_domain

@rallytime rallytime merged commit 4eb43af into saltstack:2018.3 Oct 4, 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 Oct 4, 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.