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 the 'cidr' arg in salt.modules.network.ip_addrs6() #29587

Merged
merged 1 commit into from Dec 10, 2015

Conversation

Projects
None yet
3 participants
@job
Contributor

job commented Dec 9, 2015

The two arguments to ip_in_subnet() should be swapped around, but
since ip_in_subnet() is being deprecated in favor of in_subnet(),
removing three characters seemed like the most appropiate bugfix.

This fixes #29585

Fix the 'cidr' arg in salt.modules.network.ip_addrs6()
The two arguments to ip_in_subnet() should be swapped around, but
since ip_in_subnet() is being deprecated in favor of in_subnet(),
removing three characters seemed like the most appropiate bugfix.

This fixes #29585
@job

This comment has been minimized.

Show comment
Hide comment
@job

job Dec 9, 2015

Contributor

Please cherry-pick this commit into the 2015.8 branch as well!

Contributor

job commented Dec 9, 2015

Please cherry-pick this commit into the 2015.8 branch as well!

cachedout added a commit that referenced this pull request Dec 10, 2015

Merge pull request #29587 from job/fix-cidr-argument-network.ip_addrs6
Fix the 'cidr' arg in salt.modules.network.ip_addrs6()

@cachedout cachedout merged commit feadd9b into saltstack:develop Dec 10, 2015

4 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11926 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2990 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11631 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10496 — SUCCESS
Details
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 10, 2015

Contributor

Thanks, @job . We'll get this backported as well.

Contributor

cachedout commented Dec 10, 2015

Thanks, @job . We'll get this backported as well.

@job job deleted the job:fix-cidr-argument-network.ip_addrs6 branch Dec 10, 2015

cachedout added a commit that referenced this pull request Dec 10, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment