[2016.3] Merge forward from 2015.8 to 2016.3 #35487
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
To support multiple platforms, it will be difficult to try to account for various path seperators and drive lettering schemes on the receiving end of a file push. Instead, transition to an interface wherein the file path is first split and seperators removed prior to it being sent from the minion to the master.
…unavailable repos
This results in the output from salt-ssh being empty, this fix ensures that the output is always there
Ensure that output for salt-ssh gets back
fixes saltstack#34279 - disk cache ttl expiry
…hanged Bugfix: zypper mod repo unchanged
Add ignore_repo_failure option to suppress zypper's exit code 106 on …
win_pkg: Fix traceback when package is not installed
Fixup SSH bug where sudo without sudo user would break
Resolve path issues with cp.push
Conflicts: - salt/cloud/deploy/bootstrap-salt.sh
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: