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 2018.3.1 to 2018.3 #47783

merged 35 commits into from May 23, 2018


None yet
7 participants

rallytime commented May 22, 2018

No conflicts.

gtmanfred and others added some commits May 8, 2018

fix _create_stream and tornado 5.0
This should be the last fix for tornado 5.0
Fix last test for tornado
Thank you so much @bdarnell for helping me get this last fix.

With this, the test suite passes with tornado 5.
Merge pull request #47706 from Ch3LL/mac_service_util
Add cmd._run_all_quiet to mac_utils and __utils__ in mac_service
Merge pull request #47541 from gtmanfred/2018.3
switch skip-roster to update-roster
Merge pull request #47641 from gtmanfred/2018.3.1
fix _create_stream and tornado 5.0
Fix spurious "Malformed request" error
Since we are invoking _ext_nodes now for backward compatibility, an
entry for it needed to be added to the cmd_stub.
Change deprecation warning to debug logging
This prevents a confusing warning from being logged to the console (and
to the log file upon each salt-minion daemon restart).

It seems that the intent of the deprecation warning was to use the logic
in `warn_until` to force us to make the final deprecation when the
Magnesium release cycle arrives, but when we do these sort of
deprecations we are typically pro-active and do a grep on the release
codename. So, keeping "Magnesium" in the log message should be
sufficient to remind us of this.
pkg.install execution module on windows ensures the software package is
installed when no version is specified, it does not upgrade the software
to the latest. This is per the design. pkg.latest must provide the versions
to install to pkg.install
Merge pull request #47736 from Ch3LL/fix_util_mac_test
mac_utils test: patch __salt__['*']
Merge pull request #47727 from Ch3LL/spelling
Fix salt.utils.versions.warn_until spelling

gtmanfred and others added some commits May 21, 2018

@rallytime rallytime merged commit 4a6ca67 into saltstack:2018.3 May 23, 2018

6 of 9 checks passed

jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19221 — ABORTED
default Build finished.
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5165 — FAILURE
WIP ready for review
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25355 — SUCCESS
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17444 — SUCCESS
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23098 — SUCCESS
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10135 — SUCCESS
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22074 — SUCCESS

@rallytime rallytime deleted the rallytime:merge-2018.3 branch May 23, 2018

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