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

Merged
merged 20 commits into from Mar 5, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Mar 5, 2019

Conflicts:

  • doc/conf.py
  • salt/modules/zfs.py
alan-cugler and others added 20 commits Feb 21, 2019
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
Make recurse and directory case sensitive (2017.7)
Py3 server docs update
Update release versions for the 2017.7 branch
Gate zfs module on Windows
fix reactor ping test
Avoid race condition when initializing OpenSSL
Add __virtual__ to win_update
Conflicts:
 - doc/conf.py
 - salt/modules/zfs.py
@dwoz
dwoz approved these changes Mar 5, 2019
@dwoz dwoz merged commit c8e2971 into saltstack:2018.3 Mar 5, 2019
9 checks passed
9 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/lint Python lint test 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/py2-windows-2016 The py2-windows-2016 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
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@Ch3LL Ch3LL deleted the Ch3LL:merge-2018.3 branch Mar 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.