Merge pull request #34740 from rallytime/merge-2016.3

[2016.3] Merge forward from 2015.8 to 2016.3

conf/master

@@ -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
 

doc/ref/configuration/master.rst

@@ -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``