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

[2017.7] Merge forward from 2017.7.6 to 2017.7 #47748

Merged
merged 27 commits into from May 22, 2018

Conversation

Projects
None yet
7 participants
@rallytime
Contributor

rallytime commented May 21, 2018

No conflicts.

Yann Jouanin and others added some commits May 17, 2018

Yann Jouanin
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
handle new _create_stream in tornado 5.0
In tornado 5.0, this _create_stream function now returns a tuple instead of
just the stream.connect() object.  So since we are overriding it, we need to
update.

Also initialize the SaltMessageServer with the current io_loop set.
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 #47632 from gtmanfred/2017.7.6
handle new _create_stream in tornado 5.0
Yann Jouanin
Merge pull request #47700 from yannj-fr/2017.7.6
fix roots modification time check
Merge pull request #47702 from damon-atkins/2017.7.6_fix_pkg.latest_s…
…tate

State pkg.latest called win pkg.install with list of pkgs and the required versions
Merge pull request #47747 from Ch3LL/rn_2017.7.6
Add changelog to 2017.7.6 release notes

gtmanfred and others added some commits May 21, 2018

Merge pull request #47769 from gtmanfred/2017.7.6
skip test that breaks test suite
Merge pull request #47775 from gtmanfred/2017.7.6
catch UnsupportedOperation with AssertionError

@rallytime rallytime merged commit 3ddc56c into saltstack:2017.7 May 22, 2018

7 of 9 checks passed

default Build started sha1 is merged.
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19205 — RUNNING
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25339 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17428 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5149 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23082 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10119 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22058 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2017.7 branch May 22, 2018

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