[2015.8] Merge forward from 2015.5 to 2015.8 #31549
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
Backport of PR saltstack#31382 into 2015.5.
…ultimaster_failover_2015.5 Set auth retry count to 0 if multimaster mode is failover.
…-docs Update contributing docs
Remove duplicate "timeout" definition in Roster docs
This commit extends the fileclient such that it is possible to override the base directory for file caching. The new "cachedir" param can be either a relative path or an absolute path. If it is relative, the path will be appended to __opts__['cachedir'], and if it is absolute then it will take the place of __opts__['cachedir'].
salt-ssh: Fix race condition when caching files to build the thin tarball
Conflicts: - salt/client/ssh/state.py - salt/fileclient.py - salt/minion.py
rallytime
pushed a commit
that referenced
this pull request
Feb 29, 2016
[2015.8] Merge forward from 2015.5 to 2015.8
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: