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 2018.3.4 to 2018.3 #51802

Merged
merged 5 commits into from Mar 1, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 25, 2019

Conflicts:

  • None
dwoz and others added 4 commits Feb 19, 2019
[2018.3.4] Fix ruby gems tests, again
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 25, 2019
@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented Mar 1, 2019

@saltstack/team-core FYI, looks like these tests are failing on both the 2018.3 and 2018.3.4 branch. So this should be good to merge.

@waynew

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2019

I'm confused - there are commits but don't appear to be any files changed??

@dwoz
dwoz approved these changes Mar 1, 2019
@dwoz dwoz merged commit 77c2796 into saltstack:2018.3 Mar 1, 2019
4 of 8 checks passed
4 of 8 checks passed
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-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
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
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3.4 branch Mar 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.