[2016.3] Merge forward from 2015.8 to 2016.3 #33710
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
This check exists twice in the code. Once is good enough for anyone.
The way the version check was implemented fails on ancient pip versions that do not provide pip.__version__ yet. We will therefore simply try to import InstallationError and fall back to ValueError if it has not been defined in the installed pip version.
Calling `zypper --gpg-auto-import-keys refresh` is required after adding/modifying a repository because `--gpg-auto-import-keys` doesn't do anything when called with `zypper ar` or `zypper mr`. Without calling `zypper --gpg-auto-import-keys refresh` here, calling `zypper ref` after adding/removing would still ask for accepting/rejecting the gpg key.
Fix crash on unconnectable MySQL server (resolves saltstack#33582)
Since failed auths are most often due to key rotation, they should be logged as debug messages rather than errors.
Lower the log level for failed auths
…anged) allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading)
Back-port saltstack#33599 to 2015.8
Call zypper refresh after adding/modifying a repository
modules.cp.get_url: add test for https://
Conflicts: - salt/utils/aws.py - salt/utils/s3.py
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.
Conflicts: