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 #36028 to 2015.8 #36730

Merged
merged 1 commit into from
Oct 1, 2016
Merged

Back-port #36028 to 2015.8 #36730

merged 1 commit into from
Oct 1, 2016

Conversation

rallytime
Copy link
Contributor

@rallytime rallytime commented Sep 30, 2016

Back-port #36028 to 2015.8

The original PR wouldn't back-port cleanly so I made the changes
in saltstack#36028 by hand.
@rallytime
Copy link
Contributor Author

Refs #35989

@cachedout cachedout merged commit 804a2a1 into saltstack:2015.8 Oct 1, 2016
@rallytime rallytime deleted the bp-36028 branch October 7, 2016 14: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