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

[2017.7] Merge forward from 2017.7.1 to 2017.7 #43035

Merged
merged 2 commits into from Aug 18, 2017

Conversation

rallytime
Copy link
Contributor

@rallytime rallytime commented Aug 17, 2017

No conflicts.

This just brings the commits from 2017.7.1 forward into 2017.7. It is expected that there are no files changed here as the file changes from #42948 should be the same changes from #42945.

Nicole Thomas added 2 commits August 15, 2017 14:02
[2017.7.1] Add clean_id function to salt.utils.verify.py
@rallytime rallytime merged commit d15b0ca into saltstack:2017.7 Aug 18, 2017
@rallytime rallytime deleted the merge-2017.7 branch August 18, 2017 12:58
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

1 participant