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

* upstream/develop: (97 commits)
  Document how to test for the existence of a log message (saltstack#34738)
  Use six.iteritems instead of iteritems() in configcomparer
  Use six.iteritems instead of iteritems() in etcd_util
  Use six.iteritems instead of iteritems() in psutil_compat
  Use six.iteritems instead of iteritems() in junos grains
  Use six.iteritems instead of iteritems() in vultrpy driver
  Use six.iteritems instead of iteritems() in profitbricks driver
  Use six.iteritems instead of iteritems() in nova driver
  Use six.iteritems instead of iteritems() in linode driver
  Use six.iteritems instead of iteritems() in ec2 driver
  modules/ebuild: Add handling for InvalidAtom exception (saltstack#34727)
  Add valid function to mine module.
  Loop over updated keys in non recursive update
  Update mock value to match change in saltstack#34270.
  Add versionadded to "special" option in cron.present state (saltstack#34707)
  NILinuxRT fix timezone module (saltstack#34710)
  Add state module to manage InfluxDB databases
  Add state module to manage InfluxDB users
  Add influx module for InfluxDB 0.9+
  Normalise function argument formatting
  ...

conf/master

@@ -131,15 +131,15 @@
 # By default, events are not queued.
 #event_return_queue: 0
 
-# Only return events matching tags in a whitelist,
-# event_return_whitelist:
-#   - salt/master/a_tag
-#   - salt/master/another_tag
-
-# Store all event returns _except_ the tags in a blacklist.
-# event_return_blacklist:
-#   - salt/master/not_this_tag
-#   - salt/master/or_this_one
+# Only return events matching tags in a whitelist, supports glob matches.
+#event_return_whitelist:
+#  - salt/master/a_tag
+#  - salt/run/*/ret
+
+# Store all event returns **except** the tags in a blacklist, supports globs.
+#event_return_blacklist:
+#  - salt/master/not_this_tag
+#  - salt/wheel/*/ret
 
 # Passing very large events can cause the minion to consume large amounts of
 # memory. This value tunes the maximum size of a message allowed onto the

doc/ref/configuration/master.rst

@@ -229,6 +229,7 @@ The directory to store the pki authentication keys.
 ---------------------
 
 .. versionchanged:: 2016.3.0
+
     The default location for this directory has been moved. Prior to this
     version, the location was a directory named ``extmods`` in the Salt
     cachedir (on most platforms, ``/var/cache/salt/extmods``). It has been
@@ -517,11 +518,15 @@ Default: ``[]``
 
 Only return events matching tags in a whitelist.
 
+.. versionchanged:: Carbon
+
+    Supports glob matching patterns.
+
 .. code-block:: yaml
 
     event_return_whitelist:
       - salt/master/a_tag
-      - salt/master/another_tag
+      - salt/run/*/ret
 
 .. conf_master:: event_return_blacklist
 
@@ -534,11 +539,15 @@ Default: ``[]``
 
 Store all event returns _except_ the tags in a blacklist.
 
+.. versionchanged:: Carbon
+
+    Supports glob matching patterns.
+
 .. code-block:: yaml
 
     event_return_blacklist:
       - salt/master/not_this_tag
-      - salt/master/or_this_one
+      - salt/wheel/*/ret
 
 .. conf_master:: max_event_size
 
@@ -1574,6 +1583,7 @@ Defines which branch/tag should be used as the ``base`` environment.
     gitfs_base: salt
 
 .. versionchanged:: 2014.7.0
+
     Ability to specify the base on a per-remote basis was added. See :ref:`here
     <gitfs-per-remote-config>` for more info.
 
@@ -3348,6 +3358,7 @@ used.
 ---------------
 
 .. versionchanged:: 2015.8.0
+
     Renamed from ``win_repo`` to ``winrepo_dir``.
 
 Default: ``/srv/salt/win/repo``
@@ -3384,9 +3395,11 @@ out for 2015.8.0 and later minions.
 ---------------------
 
 .. versionchanged:: 2015.8.0
+
     Renamed from ``win_repo_mastercachefile`` to ``winrepo_cachefile``
 
 .. note::
+
     2015.8.0 and later minions do not use this setting since the cachefile
     is now located on the minion.
 
@@ -3406,6 +3419,7 @@ created.
 -------------------
 
 .. versionchanged:: 2015.8.0
+
     Renamed from ``win_gitrepos`` to ``winrepo_remotes``.
 
 Default: ``['https://github.com/saltstack/salt-winrepo.git']``