[2015.5] Merge forward from 2014.7 to 2015.5 #27176
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
Replaced password with redacted when displayed
minor doc site updates
Issue warning that some log levels may contain sensitive data
made 2014.7 an archived release
Conflicts:
doc/conf.py
salt/__init__.py
salt/cli/__init__.py
basepi
added a commit
that referenced
this pull request
Sep 17, 2015
[2015.5] Merge forward from 2014.7 to 2015.5
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.5] Merge forward from 2014.7 to 2015.5
The
salt/__init__.pyandsalt/cli/__init__.pychanges didn't merge forward, since those files have been split up into a myriad of other files. So I basically addedverify_logcalls anywhere we calledself.setup_logfile_logger(). You'll have to keep me posted if that's correct, @cachedout.