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 #29587 to 2015.8 #29596

merged 1 commit into from Dec 10, 2015


None yet
3 participants

rallytime commented Dec 10, 2015

Back-port #29587 to 2015.8

Fix the 'cidr' arg in
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

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

@cachedout cachedout merged commit ffb54cc into saltstack:2015.8 Dec 10, 2015

4 of 5 checks passed

default Merged build finished.
jenkins/salt-pr-clone Salt PR - Clone Repository #11937 — SUCCESS
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3001 — SUCCESS
jenkins/salt-pr-lint-n Salt PR - Code Lint #11642 — SUCCESS
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10507 — SUCCESS

@rallytime rallytime deleted the rallytime:bp-29587 branch Dec 10, 2015

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