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

[2018.3] Merge forward from 2017.7 to 2018.3 #49784

Merged
merged 10 commits into from
Sep 28, 2018

Conversation

rallytime
Copy link
Contributor

No conflicts.

mattLLVW and others added 5 commits September 21, 2018 16:53
This allows us to properly clean out the workspace before a job run.
Fix test opts in append, prepend states/file.py
@rallytime rallytime closed this Sep 26, 2018
@rallytime rallytime reopened this Sep 26, 2018
@dubb-b dubb-b closed this Sep 27, 2018
@dubb-b dubb-b reopened this Sep 27, 2018
@dubb-b dubb-b closed this Sep 27, 2018
@dubb-b dubb-b reopened this Sep 27, 2018
@dubb-b dubb-b closed this Sep 27, 2018
@dubb-b dubb-b reopened this Sep 27, 2018
@rallytime rallytime closed this Sep 27, 2018
@rallytime rallytime reopened this Sep 27, 2018
@rallytime rallytime merged commit 804d52c into saltstack:2018.3 Sep 28, 2018
@rallytime rallytime deleted the merge-2018.3 branch September 28, 2018 17:30
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.

5 participants