Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2016.3] Merge forward from 2015.8 to 2016.3 #34520

Merged
merged 10 commits into from
Jul 7, 2016

Conversation

rallytime
Copy link
Contributor

Conflicts:

  • doc/ref/configuration/minion.rst

Nicole Thomas and others added 10 commits July 6, 2016 13:29
* 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
@rallytime rallytime merged commit b9e8762 into saltstack:2016.3 Jul 7, 2016
@rallytime rallytime deleted the merge-2016.3 branch July 7, 2016 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants