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 #33518 to 2016.3 #35467

Merged
merged 3 commits into from
Aug 16, 2016
Merged

Back-port #33518 to 2016.3 #35467

merged 3 commits into from
Aug 16, 2016

Conversation

rallytime
Copy link
Contributor

Back-port #33518 to 2016.3

The original back-port of #33518 was supposed to be in #35235, but unfortunately that PR was made against develop instead of 2016.3. This correctly back-ports the change to the 2016.3 branch.

@cachedout cachedout merged commit d2dd78e into saltstack:2016.3 Aug 16, 2016
@rallytime rallytime deleted the bp-33518 branch August 16, 2016 14:48
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.

3 participants