[2016.3] Merge forward from 2015.8 to 2016.3 #34520
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
* Updated skipTest to check for debian or redhat * Removed skipIf import
…stack#34492) * Gracefully handle non-XML command output. * Omit gluster command usage line. * Remove unnecessary import.
* Add top file config params to minion config file documentation * Improve documentation on top file merging behavior * Add recommendation on changing top_file_merging_strategy * Improve the log message warning of multiple top files
These two test files are currently not running automatically on Jenkins. Renaming these files will add them to the full runtests.py run.
…doc-fix Use -O in the wget example in the bootstrap tutorial for the develop branch
Lower the log level for modules which cannot be loaded to trace
Conflicts: - doc/ref/configuration/minion.rst
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: