Merge branch '2015.5' into '2015.8'

No conflicts.

conf/minion

@@ -83,6 +83,13 @@
 # clusters.
 #id:
 
+# Cache the minion id to a file when the minion's id is not statically defined
+# in the minion config. Defaults to "True". This setting prevents potential
+# problems when automatic minion id resolution changes, which can cause the
+# minion to lose connection with the master. To turn off minion id caching,
+# set this config to ``False``.
+#minion_id_caching: True
+
 # Append a domain to a hostname in the event that it does not exist.  This is
 # useful for systems where socket.getfqdn() does not actually result in a
 # FQDN (for instance, Solaris).

doc/ref/configuration/minion.rst

@@ -294,6 +294,30 @@ ids.
 
     id: foo.bar.com
 
+.. conf_minion:: minion_id_caching
+
+``minion_id_caching``
+---------------------
+
+.. versionadded:: 0.17.2
+
+Default: ``True``
+
+Caches the minion id to a file when the minion's :minion_conf:`id` is not
+statically defined in the minion config. This setting prevents potential
+problems when automatic minion id resolution changes, which can cause the
+minion to lose connection with the master. To turn off minion id caching,
+set this config to ``False``.
+
+For more information, please see `Issue #7558`_ and `Pull Request #8488`_.
+
+.. code-block:: yaml
+
+    minion_id_caching: True
+
+.. _Issue #7558: https://github.com/saltstack/salt/issues/7558
+.. _Pull Request #8488: https://github.com/saltstack/salt/pull/8488
+
 .. conf_minion:: append_domain
 
 ``append_domain``
@@ -456,6 +480,23 @@ parameter. The wait-time will be a random number of seconds between
 
     random_reauth_delay: 60
 
+.. conf_minion:: auth_tries
+
+``auth_tries``
+--------------
+
+.. versionadded:: 2014.7.0
+
+Default: ``7``
+
+The number of attempts to authenticate to a master before giving up. Or, more
+technically, the number of consecutive SaltReqTimeoutErrors that are acceptable
+when trying to authenticate to the master.
+
+.. code-block:: yaml
+
+    auth_tries: 7
+
 .. conf_minion:: acceptance_wait_time_max
 
 ``acceptance_wait_time_max``

salt/modules/iptables.py

@@ -1233,7 +1233,7 @@ def _parser():
     ## sctp
     add_arg('--chunk-types', dest='chunk-types', action='append')
     ## set
-    add_arg('--match-set', dest='match-set', action='append', nargs=2)
+    add_arg('--match-set', dest='match-set', action='append')
     add_arg('--return-nomatch', dest='return-nomatch', action='append')
     add_arg('--update-counters', dest='update-counters', action='append')
     add_arg('--update-subcounters', dest='update-subcounters', action='append')