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

Merged
merged 74 commits into from Jan 27, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Jan 25, 2019

Conflicts:

  • .codecov.yml
  • salt/modules/artifactory.py
Ch3LL and others added 30 commits Jan 16, 2019
This also normalizes some hacks that were in place to import reload from
importlib, so that these instances also use the compatibility function.
(cherry picked from commit eb7fb38)
Also update the no-fs flag on the thorium system.
…ed double quote.
…the string.
[2017.7] Backport #50358 to 2017.7
There doesn't appear to be any reason to parse or override it here.
Also allows allows TLS connections to work.
dwoz and others added 26 commits Jan 23, 2019
Backport __context__ support from develop
Fix minion start issue
an argument is not always needed to be passed to open a file
Peserve newlines from pillar data for file.managed [2018.3]
Backport 50771 to 2018.3
Add 2018.3 codecov config
When `wheel_async` is used, the job completes, but for the same reason
we couldn't replace the signal in the first place, we fail to restore it
after control is returned to the context manager.

This fixes this by only adding the signal data to the `old_signals` dict
when we successfully override the signal handling, so that we don't
incorrectly attempt to "restore" the signal later.
…passing on python2 & python3
Fix 500 error when using wheel_async
[2018.3] Adding a test to ensure dns_check works as expected.
…ng_bytes_argh_python2

 [2018.3] Fixes to x509 module and test
Conflicts:
  - .codecov.yml
  - salt/modules/artifactory.py
@dwoz
dwoz approved these changes Jan 27, 2019
@dwoz dwoz merged commit 02b43a0 into saltstack:2019.2 Jan 27, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
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-2019.2 branch Feb 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.