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.

Sign up for GitHub

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

Jump to bottom

[2016.3] Merge forward from 2015.8 to 2016.3 #34520

Merged
merged 10 commits into from
Jul 7, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34520

merged 10 commits into from
Jul 7, 2016

Commits on Jul 6, 2016

  1. Update dnsmasq.get_config docs to use correct config_file param. (sal… 

    …tstack#34488)

Fixes saltstack#34261
    Nicole Thomas committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    0f3f87f View commit details
    Browse the repository at this point in the history

  2. Use skipTest for network state integration test (saltstack#34489) 

    * Updated skipTest to check for debian or redhat

* Removed skipIf import
    Justin Anderson authored and Nicole Thomas committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    7529945 View commit details
    Browse the repository at this point in the history

  3. Gracefully handle non-XML output in GlusterFS execution module. (salt… 

    …stack#34492)

* Gracefully handle non-XML command output.

* Omit gluster command usage line.

* Remove unnecessary import.
    @zer0def
    zer0def authored and Nicole Thomas committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    6ce7cb9 View commit details
    Browse the repository at this point in the history

  4. Use -O in wget develop example in bootstrap tutorial

    rallytime committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    23c5739 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. Improve top file merging documentation (saltstack#34505) 

    * 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
    Erik Johnson authored and Nicole Thomas committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    8722257 View commit details
    Browse the repository at this point in the history

  2. Rename some unit test files by adding _test (saltstack#34503) 

    These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
    Nicole Thomas committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    3ebba02 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#34498 from rallytime/bootstrap-tutorial-… 

    …doc-fix

Use -O in the wget example in the bootstrap tutorial for the develop branch
    Mike Place committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    63f0451 View commit details
    Browse the repository at this point in the history

  4. Lower the log level for modules which cannot be loaded to trace

    Mike Place committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    733c5d0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#34513 from cachedout/lower_loader_log 

    Lower the log level for modules which cannot be loaded to trace
    Mike Place committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    a516f11 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2015.8' into '2016.3' 

    Conflicts:
  - doc/ref/configuration/minion.rst
    rallytime committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    27988dd View commit details
    Browse the repository at this point in the history