Merge branch 'develop' of github.com:saltstack/salt into develop

doc/ref/runners.rst

@@ -23,7 +23,7 @@ contains a function called ``foo`` then the function could be called with:
 
 .. code-block:: bash
 
-    # salt '*' test.foo
+    # salt-run '*' test.foo
 
 Examples
 --------

doc/topics/releases/0.10.2.rst

@@ -72,6 +72,17 @@ A number of users complained that they had inadvertently deleted the wrong salt
 authentication keys. 0.10.2 now displays what keys are going to be deleted
 and verifies that they are the keys that are intended for deletion.
 
+Key auto-signing
+----------------
+
+If ``autosign_file`` is specified in the configuration file incoming keys
+will be compared to the list of keynames in ``autosign_file``. Regular
+expressions as well as globbing is supported.
+
+The file must only be writable by the user otherwise the file will be
+ignored. To relax the permission and allow group write access set the
+``permissive_pki_access`` option.
+
 Module changes
 --------------
 

salt/output.py

@@ -5,6 +5,8 @@ A simple way of setting the output format for data from modules
 # Import Python libs
 import json
 import pprint
+import logging
+import traceback
 
 # Import third party libs
 import yaml
@@ -21,6 +23,8 @@ from salt.exceptions import SaltException
 
 __all__ = ('get_outputter',)
 
+log = logging.getLogger(__name__)
+
 
 def display_output(ret, out, opts):
     '''
@@ -196,6 +200,7 @@ class JSONOutputter(Outputter):
                 kwargs.pop('color')
             ret = json.dumps(data, **kwargs)
         except TypeError:
+            log.debug(traceback.format_exc())
             # Return valid json for unserializable objects
             ret = json.dumps({})
         print(ret)