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

Merged
merged 30 commits into from Jun 13, 2018

Conversation

Projects
None yet
5 participants
@rallytime
Contributor

rallytime commented Jun 11, 2018

Conflicts:

  • requirements/base.txt
  • salt/states/archive.py
  • salt/states/file.py
  • tests/integration/runners/test_state.py
  • tests/unit/daemons/test_masterapi.py

twangboy and others added some commits May 8, 2018

Fix deprecated exception handling
Use 'path is on' to account for instances where the message is 'path is
on mount' vs 'path is on drive', both of which will throw this error.
Merge pull request #47827 from twangboy/fix_47791
Fix issue when archive is on mapped drive
Merge pull request #47533 from twangboy/fix_47178
Fix issues with functions that use makedirs on Windows
Merge pull request #47959 from twangboy/fix_test_service
Fix failing test when service doesn't exist
Merge pull request #47978 from twangboy/fix_test_pkg
Add try/finally, fix typo in 7zip def file
Merge pull request #47968 from gtmanfred/2017.7
Clean up tox + pytest
Merge pull request #48009 from dwoz/winswarmfix
minionswarm runs on windows
Merge pull request #48044 from twangboy/wua_add_fail_code
Add fail code for WinHTTP send/receive error
Merge branch '2017.7' into '2018.3'
Conflicts:
  - requirements/base.txt
  - salt/states/archive.py
  - salt/states/file.py
  - tests/integration/runners/test_state.py
  - tests/unit/daemons/test_masterapi.py
@rallytime

This comment has been minimized.

Contributor

rallytime commented Jun 12, 2018

re-run py

@rallytime rallytime merged commit b10b735 into saltstack:2018.3 Jun 13, 2018

7 of 9 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19737 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25882 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17901 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5683 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23613 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10654 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22532 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jun 13, 2018

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