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

Back-port #49355 to 2018.3 #50804

Merged
merged 11 commits into from Dec 10, 2018

Conversation

Projects
None yet
3 participants
@Ch3LL
Copy link
Contributor

commented Dec 10, 2018

Backport #49355

Conflict:

  • salt/templates/debian_ip/debian_eth.jinja

MTecknology added some commits Aug 28, 2018

Added support for dns_{nameservers,search} being a list or string.
Conflicts:
  - salt/templates/debian_ip/debian_eth.jinja
Cleaned up documentation/examples in states.network:
- Updated debian-based distro comment
- Fixed example of configuring a loopback device
- Cleaned up copy/paste mistakes
- Added more examples
- Verified examples work on Debian 9

@cachedout cachedout merged commit b266e8b into saltstack:2018.3 Dec 10, 2018

9 of 10 checks passed

jenkins/pr/py3-windows-2016 running py3-windows-2016...
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
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
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.