[2015.8] Merge forward from 2015.5 to 2015.8 #27885
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
Fixes saltstack#27201, saltstack#27610. saltstack#27201 was incomplete in its deprecation of hash_hostname.
The implicit call to syslog.openlog will already add salt-minion (technically `sys.argv[0]`) to the syslog.syslog call. It's redundant (and not technically correct) to have salt-minion here. Can also be applied to 2015.8 and develop without issue. Fixes saltstack#27756
…roups-backport 2015.5 postgres_user groups backport
Also correctly wrap the output of orchestrate with 'data' key This was put in as a fix for the orchestrate runner in saltstack#25521. However, we just needed to wrap the return in 'data' to get it to be stripped automatically. The lack of 'outputter' was causing us to not properly strip the 'data' further down, and the highstate outputter would subsequently barf.
…utputter.27831 [2015.5] Fix highstate outputter for jobs.lookup_jid
Back-port saltstack#27806 to 2015.5
Detect Manjaro Linux as Arch derivative
Remove redundant text from syslog returner
better check for debian userdel error
return message when local jobs_cache not found
deprecate hash_hostname in favor of hash_known_hosts
Conflicts:
salt/modules/postgres.py
salt/states/postgres_user.py
basepi
added a commit
that referenced
this pull request
Oct 13, 2015
[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.
[2015.8] Merge forward from 2015.5 to 2015.8