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

Merged
merged 7 commits into from Jan 15, 2019

Conversation

Projects
None yet
4 participants
@Ch3LL
Copy link
Contributor

commented Jan 11, 2019

No description provided.

jasonarewhy and others added some commits Dec 13, 2018

Merge pull request #50858 from jasonarewhy/bugfix-2017.7/ubuntu-netwo…
…rking-searchdomain

get searchdomain in Ubuntu 12+ (2017.7)
Merge branch '2017.7' into '2018.3'
Conflicts:
  - tests/unit/modules/test_debian_ip.py
@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Jan 14, 2019

@Ch3LL A couple lint failures.

Ch3LL and others added some commits Jan 14, 2019

@dwoz dwoz merged commit 06854cf into saltstack:2018.3 Jan 15, 2019

10 checks passed

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

@Ch3LL Ch3LL deleted the Ch3LL:merge-2018.3 branch Jan 17, 2019

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.