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 #48431

Merged
merged 18 commits into from Jul 5, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Contributor

rallytime commented Jul 3, 2018

No conflicts.

dwoz and others added some commits Jun 30, 2018

Merge pull request #48396 from dwoz/symlink_test_fix
Fix file.symlink state test for windows
Add regression test for Issue #48230
This also tests the fix for issue #38914
Merge pull request #48409 from dwoz/test_prepend_fix
Fix file state prepend test
Merge pull request #48405 from Ch3LL/rm_inprog_2017.7
[2017.7] Remove In Progress Warning on 2017.7.7
Merge pull request #48385 from Ch3LL/1update_version_doc_2017.7
Update release versions for the 2017.7 branch
Merge pull request #48416 from dwoz/service_integration_fix
Fix service integration test (py3)
Merge pull request #48413 from twangboy/fix_47811
Fix archive.extracted to handle UNC paths
Merge pull request #48410 from dwoz/service_dead_test_fix
Fix service dead test on windows
Merge pull request #48422 from rallytime/fix-48230
Allow file.managed to work with uppercase source_hash in test=true mode

@rallytime rallytime merged commit 2baa7f1 into saltstack:2018.3 Jul 5, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
default Pull Requests » Salt PR - Main Build - PY2/PY3 #9951
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11194 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26436 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18472 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6224 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24152 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23108 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20277 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jul 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment