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

Fix ipaddress imports #51595

Merged
merged 2 commits into from Feb 13, 2019

Conversation

@mirceaulinic
Copy link
Member

commented Feb 12, 2019

What does this PR do?

I am porting @isbm's commit 824e0e5 into the 2019.2 branch, which is required at least in the Netbox Pillar module, as per @avolmensky's comment: #49705 (comment)

@mirceaulinic mirceaulinic requested a review from saltstack/team-core as a code owner Feb 12, 2019
@dwoz
dwoz approved these changes Feb 13, 2019
@dwoz dwoz merged commit c96464b into saltstack:2019.2 Feb 13, 2019
10 checks passed
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.