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

modules.proxy: __virtual__ return err msg #34879

Merged
merged 1 commit into from
Jul 22, 2016

Conversation

abednarik
Copy link
Contributor

@abednarik abednarik commented Jul 22, 2016

What does this PR do?

Update proxy module to return a proper message when system is not Windows or MacOS.

@rallytime rallytime merged commit 99c872b into saltstack:develop Jul 22, 2016
@rallytime
Copy link
Contributor

Thanks @abednarik!

@abednarik abednarik deleted the virtual_ret_proxy_module branch July 22, 2016 15:26
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 22, 2016
* upstream/develop:
  Regression fix: minion ID generator should use FQDN first, if available (saltstack#34876)
  Add VirtuozzoLinux is yumpkg enable list. (saltstack#34878)
  modules.proxy: __virtual__ return err msg (saltstack#34879)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants