[2016.11] Merge forward from 2016.3 to 2016.11 #39317
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
…eeded with ident:true), fixes saltstack#39220
Dulwich support is being removed for the Oxygen release (see saltstack#39210).
Use 'if' instead of 'in case'
…pillar Because we check in the master opts first, if the environment or pillarenv values are set in the master config file, they will take precedence over the values specified in the minion config (or gathered via the CLI). This commit fixes that ordering such that the values passed to __gen_opts() take precedence over the values from the master config.
Fix bug 39220
Rewrap the paragraph to fit in 80 chars line. The contents isn't changed.
Remove extra empty line
…ecedence Allow minion/CLI saltenv/pillarenv to override master when compiling pillar
Fix link in proxyminion guide
Whitespace fix in docs Makefile
Add doc to recommend pgjsonb for master job caches
No conflicts.
[2016.3] Merge forward from 2015.8 to 2016.3
Conflicts: - salt/returners/postgres.py - salt/returners/postgres_local_cache.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: