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

Projects
None yet
5 participants
@rallytime
Copy link
Contributor

commented Sep 26, 2018

No conflicts.

mattLLVW and others added some commits Sep 21, 2018

Move all pipelines to be fully scripted
This allows us to properly clean out the workspace before a job run.
Merge pull request #49736 from mattLLVW/fix-file-touch
Fix test opts in append, prepend states/file.py
Merge pull request #49774 from KaiSforza/declarativeToScripted
Move all pipelines to be fully scripted

@rallytime rallytime requested a review from gtmanfred Sep 26, 2018

@rallytime rallytime closed this Sep 26, 2018

@rallytime rallytime reopened this Sep 26, 2018

@rallytime rallytime closed this Sep 26, 2018

@rallytime rallytime reopened this Sep 26, 2018

KaiSforza and others added some commits 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 force-pushed the rallytime:merge-2018.3 branch from 8f04f2b to 26461f9 Sep 27, 2018

@rallytime rallytime merged commit 804d52c into saltstack:2018.3 Sep 28, 2018

4 of 8 checks passed

jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.