[2016.3] Merge forward from 2015.8 to 2016.3 #35276
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
Works fine so long as the GID of the sudo_user matches the GID of the user executing sudo -- i.e., the 'user' setting in the roster.
This prevents DNS resolution issues from causing ``salt-call --local`` to hang. Resolves saltstack#32719.
This kwarg gets stripped by the state compiler before this function is ever invoked.
Fix regression in git.latest
Back-port saltstack#35039 to 2015.8
Ensure max recursion in gitfs results in no blob object being returned.
Backport saltstack#35225 to 2015.8
Back-port saltstack#35119 to 2015.8
doc: fix broken links in the test documentation page
Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty
Default state_output_profile to True everywhere, closes saltstack#35166
Alternative sudo users for salt-ssh
Conflicts: - salt/client/ssh/__init__.py - salt/grains/core.py - salt/output/highstate.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: