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

Merged
merged 7 commits into from Jan 23, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Jan 22, 2019

Merge branch '2017.7' into merge-2018.3

Conflicts:

  • requirements/dev.txt
  • tests/unit/states/test_mount.py
garethgreenaway and others added 5 commits Jan 18, 2019
[2017.7] Backport #50358 to 2017.7
 Conflicts:
	requirements/dev.txt
	tests/unit/states/test_mount.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Jan 22, 2019
@garethgreenaway garethgreenaway changed the base branch from develop to 2018.3 Jan 22, 2019
@Ch3LL
Ch3LL approved these changes Jan 22, 2019
@s0undt3ch s0undt3ch merged commit 6796e65 into saltstack:2018.3 Jan 23, 2019
6 of 10 checks passed
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 Python lint test 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
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3 branch Feb 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.