Add docs for state_output: 'mixed'

This commit is contained in:
Colton Myers 2013-05-06 15:40:13 -06:00
parent 9c3992a50b
commit 9a2c99419d
3 changed files with 10 additions and 7 deletions

View File

@ -223,7 +223,8 @@
# The state_output setting changes if the output is the full multi line
# output for each changed state if set to 'full', but if set to 'terse'
# the output will be shortened to a single line.
# the output will be shortened to a single line. If set to 'mixed', the output
# will be terse unless a state failed, in which case that output will be full.
#state_output: full

View File

@ -340,7 +340,8 @@ Default: ``full``
The state_output setting changes if the output is the full multi line
output for each changed state if set to 'full', but if set to 'terse'
the output will be shortened to a single line.
the output will be shortened to a single line. If set to 'mixed', the output
will be terse unless a state failed, in which case that output will be full.
.. code-block:: yaml

View File

@ -12,11 +12,12 @@ state_verbose:
instruct the highstate outputter to omit displaying anything in green, this
means that nothing with a result of True and no changes will not be printed
state_output:
The highstate outputter has two output modes, `full` and `terse`. The
default is set to full, which will display many lines of detailed
information for each executed chunk. If the `state_output` option is
set to `terse` then the output is greatly simplified and shown in only one
line
The highstate outputter has three output modes, `full`, `terse`, and
`mixed`. The default is set to full, which will display many lines of
detailed information for each executed chunk. If the `state_output` option
is set to `terse` then the output is greatly simplified and shown in only
one line. If `mixed` is used, then terse output will be used unless a
state failed, in which case full output will be used.
'''
# Import python libs