valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2015.8' into '2016.3'

Browse Source 
No conflicts.
This commit is contained in:
rallytime 2016-07-18 09:45:00 -06:00
commit 7d106c78f0
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". # Set the default outputter used by the salt command. The default is "nested".
#output: 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 # Return minions that timeout when running commands like test.ping
#show_timeout: True #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. 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 .. conf_master:: color
``color`` ``color``