Merge branch '2016.11' into 'develop'

Conflicts:
  - .mention-bot

.mention-bot

@@ -1,5 +1,5 @@
 {
  "skipTitle": "Merge forward",
- "userBlacklist": ["cvrebert", "markusgattol"]
+ "userBlacklist": ["cvrebert", "markusgattol", "olliewalsh"]
 }
 

salt/minion.py

@@ -541,7 +541,7 @@ class MinionBase(object):
             for master in opts['local_masters']:
                 opts['master'] = master
                 opts.update(prep_ip_port(opts))
-                opts['master_uri_list'].append(resolve_dns(opts)['master_uri'])
+                opts['master_uri_list'].append(resolve_dns(opts, connect=False)['master_uri'])
 
             while True:
                 if attempts != 0:

salt/modules/boto_rds.py

@@ -276,10 +276,10 @@ def create(name, allocated_storage, db_instance_class, engine,
         kwargs = {}
         boto_params = set(boto3_param_map.keys())
         keys = set(locals().keys())
-        for key in keys.intersection(boto_params):
-            val = locals()[key]
+        for param_key in keys.intersection(boto_params):
+            val = locals()[param_key]
             if val is not None:
-                mapped = boto3_param_map[key]
+                mapped = boto3_param_map[param_key]
                 kwargs[mapped[0]] = mapped[1](val)
 
         taglist = _tag_doc(tags)

salt/modules/docker.py

@@ -6125,6 +6125,12 @@ def get_client_args():
 
     .. _`low-level API`: http://docker-py.readthedocs.io/en/stable/api.html
         salt myminion docker.get_client_args
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt myminion docker.get_client_args
     '''
     try:
         config_args = _argspec(docker.types.ContainerConfig.__init__).args

salt/utils/__init__.py

@@ -783,6 +783,7 @@ def dns_check(addr, port, safe=False, ipv6=None, connect=True):
 
                 if not connect:
                     resolved = candidate_addr
+                    break
 
                 s = socket.socket(h[0], socket.SOCK_STREAM)
                 try: