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

[2019.2] Merge forward from 2018.3 to 2019.2 #52190

Merged
merged 83 commits into from Mar 23, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Mar 14, 2019

Conflicts:

  • salt/transport/zeromq.py
  • tests/unit/modules/test_kubernetesmod.py
  • tests/unit/modules/test_win_file.py
alan-cugler and others added 30 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
…le file options were in place, the excludes of the last file section were being used over any previous ones. Including a test to ensure excludes work as expected when multiple file sections are in place.
Gate zfs module on Windows
fix reactor ping test
Avoid race condition when initializing OpenSSL
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
afischer-opentext-com and others added 21 commits Mar 6, 2019
There are comparisons of `None` with constant values (e.g. `'size' is None`) resulting in the comparison always being `True` or `False`.
I replaced the constant values with variable names.

I work for Semmle and I noticed these issues with out LGTM code analyzer
https://lgtm.com/projects/g/saltstack/salt/alerts/?mode=tree&ruleFocus=3980086
This can hit race conditions where we might not have a fully functional
logger.
Backport #50384 into 2018.3
Backport #52003 into 2018.3
Backport #52004 into 2018.3
Fix _compat for py3
Add all attached drives to the disks grain
Using a tilde with `:py:func:` causes it to display only the function
name and not the entire `modulepath.funcname` as the link text. This
means that it says `search()` instead of `re.search()`. While this is
still a hyperlink that goes directly to the upstream Python
documentation, using the full name as the link text should help
alleviate confusion.
Minor documentation tweak for file.replace state
Update supported python versions in installation docs
Backport #52012 into 2018.3
Conflicts:
  - salt/transport/zeromq.py
  - tests/unit/modules/test_kubernetesmod.py
  - tests/unit/modules/test_win_file.py
@garethgreenaway garethgreenaway self-requested a review Mar 22, 2019
@garethgreenaway garethgreenaway merged commit 3ac6dbd into saltstack:2019.2 Mar 23, 2019
3 of 10 checks passed
3 of 10 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/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2 branch Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.