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.3] cherry pick #49118 #49172

Merged
merged 2 commits into from Aug 17, 2018

Conversation

Projects
None yet
2 participants
@Ch3LL
Contributor

Ch3LL commented Aug 17, 2018

cherry-pick #49118

Merge conflict: tests/integration/states/test_file.py

dwoz and others added some commits Aug 14, 2018

Multiple fixes for integration.states.test_file
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
@dwoz

dwoz approved these changes Aug 17, 2018

@dwoz dwoz merged commit b3a247b into saltstack:2018.3.3 Aug 17, 2018

5 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
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-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment