Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner

salt/log/handlers/__init__.py

@@ -3,6 +3,8 @@
     salt.log.handlers
     ~~~~~~~~~~~~~~~~~
 
+    .. versionadded:: 0.17.0
+
     Custom logging handlers to be used in salt.
 
     :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
@@ -54,6 +56,8 @@ class TemporaryLoggingHandler(logging.NullHandler):
     initial log messages to the function
     :func:`TemporaryLoggingHandler.sync_with_handlers` and all stored log
     records will be dispatched to the provided handlers.
+
+    .. versionadded:: 0.17.0
     '''
 
     def __init__(self, level=logging.NOTSET, max_queue_size=10000):

salt/log/handlers/logstash_mod.py

@@ -3,6 +3,8 @@
     Logstash Logging Handler
     ========================
 
+    .. versionadded:: 0.17.0
+
     This module provides some `Logstash`_ logging handlers.
 
 

salt/log/handlers/sentry_mod.py

@@ -3,6 +3,8 @@
     Sentry Logging Handler
     ======================
 
+    .. versionadded:: 0.17.0
+
     Configuring the python `Sentry`_ client, `Raven`_, should be done under the
     ``sentry_handler`` configuration key.
     At the bare minimum, you need to define the `DSN`_. As an example:

salt/log/mixins.py

@@ -3,6 +3,8 @@
     salt.log.mixins
     ~~~~~~~~~~~~~~~
 
+    .. versionadded:: 0.17.0
+
     Some mix-in classes to be used in salt's logging
 
     :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`

salt/log/setup.py

@@ -7,7 +7,7 @@
 
     This module should be imported as soon as possible, preferably the first
     module salt or any salt depending library imports so any new logging
-    logger instance uses our ``salt.log.SaltLoggingClass``.
+    logger instance uses our ``salt.log.setup.SaltLoggingClass``.
 
 
     :copyright: 2011-2012 :email:`Pedro Algarvio (pedro@algarvio.me)`