[2017.7] Merge forward from 2017.7.6 to 2017.7 #47748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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.
Thank you so much @bdarnell for helping me get this last fix. With this, the test suite passes with tornado 5.
Back-port saltstack#47692 to 2017.7.6
handle new _create_stream in tornado 5.0
fix roots modification time check
….latest_state State pkg.latest called win pkg.install with list of pkgs and the required versions
Add changelog to 2017.7.6 release notes
No conflicts.
cachedout
approved these changes
May 21, 2018
skip test that breaks test suite
No conflicts.
catch UnsupportedOperation with AssertionError
No conflicts.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No conflicts.