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

Merged
merged 8 commits into from Oct 17, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Oct 17, 2018

No conflicts.

twangboy and others added some commits Sep 26, 2018

Mike Place
Merge pull request #50028 from basseed/fix-windows-virtual-grain
Fix #50015, Windows grain defaults to physical as unix grain
Merge pull request #49794 from twangboy/fix_groupadd_test
Fix possible issue with test_groupadd

@rallytime rallytime merged commit aa94f60 into saltstack:2018.3 Oct 17, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
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-centos-7 The py3-centos-7 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 17, 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.