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 #36246 to 2016.3 #37120

Merged
merged 2 commits into from
Oct 20, 2016
Merged

Back-port #36246 to 2016.3 #37120

merged 2 commits into from
Oct 20, 2016

Conversation

rallytime
Copy link
Contributor

Back-port #36246 to 2016.3

There was an original back-port of this PR that was supposed to go in #36418, however, not all of the commits were grabbed. This back-ports the other commits from the original PR.

@rallytime rallytime merged commit 2a35f57 into saltstack:2016.3 Oct 20, 2016
@rallytime rallytime deleted the bp-36246 branch October 20, 2016 19: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

2 participants