saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #34740 from rallytime/merge-2016.3

Browse source 
[2016.3] Merge forward from 2015.8 to 2016.3
This commit is contained in:
Nicole Thomas 2016-07-18 10:28:56 -06:00 • committed by GitHub
commit d4adf98b85
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conf/master
View file

@ -84,6 +84,11 @@
# Set the default outputter used by the salt command. The default is "nested".
#output: nested
# Set the default output file used by the salt command. Default is to output
# to the CLI and not to a file. Functions the same way as the "--out-file"
CLI option, only sets this to a single file for all salt commands.
#output_file: None
# Return minions that timeout when running commands like test.ping
#show_timeout: True

15
doc/ref/configuration/master.rst
View file

@ -347,6 +347,21 @@ Default: ``nested``
Set the default outputter used by the salt command.
.. conf_master:: output_file
``output_file``
---------------
Default: None
# Set the default output file used by the salt command. Default is to output
# to the CLI and not to a file. Functions the same way as the "--out-file"
CLI option, only sets this to a single file for all salt commands.
.. code-block:: yaml
output_file: /path/output/file
.. conf_master:: color
``color``