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 2018.3.3 to 2018.3 #49674

Merged
merged 7 commits into from Sep 18, 2018

Conversation

Projects
None yet
2 participants
@rallytime
Copy link
Contributor

commented Sep 17, 2018

Conflicts:

  • tests/whitelist.txt

dwoz and others added some commits Sep 14, 2018

Merge pull request #49655 from dwoz/2018.3.3
Fix windows test whitelist errors
Mike Place
Merge pull request #49662 from dwoz/2018.3.3
Fix another bad filename reference in whitelist
Merge branch '2018.3.3' into '2018.3'
Conflicts:
  - tests/whitelist.txt

@rallytime rallytime requested a review from dwoz Sep 17, 2018

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Sep 17, 2018

@rallytime, we need to account for some filename changes. I'll make a PR to you're branch

@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Sep 17, 2018

@dwoz Sounds good. I am having a hard time keeping all of these changes straight.

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Sep 17, 2018

Here is the PR

rallytime#31

The file name changes are to prep for @terminalmage's testing changes. They have been applied to 2018.3 forward, but happened after we branched 2018.3.3.

@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Sep 17, 2018

Oh, so I did this backwards! LOL

Merge pull request #31 from dwoz/merge-2018.3
Account for filename changes
@dwoz

dwoz approved these changes Sep 17, 2018

@rallytime rallytime merged commit a12176d into saltstack:2018.3 Sep 18, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 18, 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.