Skip to content

Commit

Permalink
Merge pull request #34173 from rallytime/fix-34162
Browse files Browse the repository at this point in the history
Update docs to match log_level default
  • Loading branch information
Mike Place authored Jun 21, 2016
2 parents c596bf5 + f577681 commit 3413c49
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/ref/cli/salt-call.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Options

.. include:: _includes/logging-options.rst
.. |logfile| replace:: /var/log/salt/minion
.. |loglevel| replace:: ``info``
.. |loglevel| replace:: ``warning``

.. include:: _includes/output-options.rst

Expand Down
2 changes: 1 addition & 1 deletion doc/ref/configuration/logging/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Examples:
``log_level``
-------------

Default: ``info``
Default: ``warning``

The level of log record messages to send to the console.
One of ``all``, ``garbage``, ``trace``, ``debug``, ``info``, ``warning``,
Expand Down
2 changes: 1 addition & 1 deletion doc/ref/configuration/minion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@ Examples:
``log_level``
-------------

Default: ``info``
Default: ``warning``

The level of messages to send to the console. See also :conf_log:`log_level`.

Expand Down

0 comments on commit 3413c49

Please sign in to comment.