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

Update regex to detect ip alias in OpenBSD. #30124

Merged
merged 1 commit into from Jan 4, 2016

Conversation

Projects
None yet
3 participants
@abednarik
Contributor

abednarik commented Jan 2, 2016

As suggested by @iMilnb regex updated. The other way around is fix this would be
to use the same approach as for Solaris systems adding a elif statement when system
is OpenBSD.

Fixes #29833.

Update regex to detect ip alias in OpenBSD.
As suggested by @iMilnb regex updated. The other way around is fix this would be
to use the same approach as for Solaris systems adding a elif statement when system
is OpenBSD.

Fixes #29833.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 4, 2016

Contributor

Let's try this without the conditional for now and see how it goes. I'd love it if @iMilnb could verify this fix after we get it merged.

Contributor

cachedout commented Jan 4, 2016

Let's try this without the conditional for now and see how it goes. I'd love it if @iMilnb could verify this fix after we get it merged.

cachedout added a commit that referenced this pull request Jan 4, 2016

Merge pull request #30124 from abednarik/fix_openbsd_ip_alias
Update regex to detect ip alias in OpenBSD.

@cachedout cachedout merged commit dd8d3e6 into saltstack:2015.8 Jan 4, 2016

3 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3805 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12469 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12168 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11051 — SUCCESS
Details
@iMilnb

This comment has been minimized.

Show comment
Hide comment
@iMilnb

iMilnb Jan 4, 2016

Contributor

It's working as expected, thanks!

Contributor

iMilnb commented Jan 4, 2016

It's working as expected, thanks!

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 4, 2016

Contributor

@iMilnb Thanks for the follow-up! Much appreciated.

Contributor

cachedout commented Jan 4, 2016

@iMilnb Thanks for the follow-up! Much appreciated.

@abednarik abednarik deleted the abednarik:fix_openbsd_ip_alias branch Jan 6, 2016

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