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

Merged
merged 9 commits into from Sep 14, 2018

Conversation

Projects
None yet
2 participants
@rallytime
Copy link
Contributor

commented Sep 13, 2018

Conflicts:

  • salt/modules/network.py

brejoc and others added some commits Apr 22, 2018

Fixed usage of ipaddress
ipaddress is imported either directly or from salt.ext. If we
use it, we shouldn't address it with salt.ext.ipaddress.
Skip flaky test on Python 3
Even with the flaky decorator, this test sometimes passes and sometimes fails.

Let's skip it for now.
Skip some unreliable tests
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/network.py

@rallytime rallytime merged commit 530e281 into saltstack:2018.3 Sep 14, 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-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
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-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/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 14, 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.