diff --git a/salt/config.py b/salt/config.py
index <HASH>..<HASH> 100644
--- a/salt/config.py
+++ b/salt/config.py
@@ -191,6 +191,7 @@ def minion_config(path):
             'test': False,
             'cython_enable': False,
             'state_verbose': True,
+            'state_output': 'full',
             'acceptance_wait_time': 10,
             'dns_check': True,
             'verify_env': True,
@@ -284,6 +285,7 @@ def master_config(path):
             'range_server': 'range:80',
             'serial': 'msgpack',
             'state_verbose': True,
+            'state_output': 'full',
             'nodegroups': {},
             'cython_enable': False,
             'key_logfile': '/var/log/salt/key',
Add state output option

State printout has been enhanced, now by default the state output shows
everything, but two options have been added to the configs that allow
for the output to be more granularly configured. state_verbose is the
same as it was, it just now defaults to True, and the new state_output
option allows for states to printout a terse return which should be nice
when running a tree with many low chunks