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

Back-port #30185 to 2015.8 #30189

Merged
merged 6 commits into from Jan 7, 2016
Merged

Back-port #30185 to 2015.8 #30189

merged 6 commits into from Jan 7, 2016

Conversation

rallytime
Copy link
Contributor

Back-port #30185 to 2015.8

@thatch45 and @cachedout Please review to make sure I managed the merge conflicts correctly.

Refs #30118

@rallytime rallytime mentioned this pull request Jan 6, 2016
basepi added a commit that referenced this pull request Jan 7, 2016
@basepi basepi merged commit ad7522c into saltstack:2015.8 Jan 7, 2016
@rallytime rallytime deleted the bp-30185 branch January 7, 2016 23:38
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.

None yet

4 participants