Back-port #34066 to 2015.8 #34174
Merged
Back-port #34066 to 2015.8 #34174
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
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 22, 2016
* upstream/develop: (25 commits) Support using private IPs (without pubic IPs) (saltstack#34187) Add 'delete' key event to list (saltstack#34189) Don't return bytes if py3 in salt-cloud (saltstack#34105) Raise the correct exception when gitfs lockfile is empty Remove unnecesssary comment Fix diskusage beacon fix salt --summary to count not responding minions correctly (saltstack#34165) doc: add missing dot (saltstack#34175) Typo fix (saltstack#34174) Update docs to match log_level warning default Fix YAML indentation in Apache state docstrings (saltstack#34166) Add integration tests for grains.append Moved imports to top, out of _get_moto_version function Updated version check. Moved check into it's own function Move log message from INFO to DEBUG. Updated test to work with new moto version. Changed strings to unicode Update package dep note to systemd-python for RHEL7 install _active_mounts_openbsd: unbreak output for special filesystems Make docker.absent honor test=true When specifying the SSH identity to use with Git as a salt URL, eg. salt://files/identity, if that file exists outside of the default base environment the file won't be accessible so we need to include the saltenv. ... # Conflicts: # salt/states/git.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.
Back-port #34066 to 2015.8