Merge branch 'develop' into issue38971

.github/stale.yml

@@ -1,8 +1,8 @@
 # Probot Stale configuration file
 
 # Number of days of inactivity before an issue becomes stale
-# 1030 is approximately 2 years and 10 months
-daysUntilStale: 1030
+# 1000 is approximately 2 years and 9 months
+daysUntilStale: 1000
 
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7

salt/cloud/clouds/digitalocean.py

@@ -969,7 +969,7 @@ def list_floating_ips(call=None):
 
     CLI Examples:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt-cloud -f list_floating_ips my-digitalocean-config
     '''
@@ -1009,7 +1009,7 @@ def show_floating_ip(kwargs=None, call=None):
 
     CLI Examples:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt-cloud -f show_floating_ip my-digitalocean-config floating_ip='45.55.96.47'
     '''
@@ -1042,7 +1042,7 @@ def create_floating_ip(kwargs=None, call=None):
 
     CLI Examples:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt-cloud -f create_floating_ip my-digitalocean-config region='NYC2'
 
@@ -1084,7 +1084,7 @@ def delete_floating_ip(kwargs=None, call=None):
 
     CLI Examples:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt-cloud -f delete_floating_ip my-digitalocean-config floating_ip='45.55.96.47'
     '''
@@ -1119,7 +1119,7 @@ def assign_floating_ip(kwargs=None, call=None):
 
     CLI Examples:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt-cloud -f assign_floating_ip my-digitalocean-config droplet_id=1234567 floating_ip='45.55.96.47'
     '''
@@ -1152,7 +1152,7 @@ def unassign_floating_ip(kwargs=None, call=None):
 
     CLI Examples:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt-cloud -f unassign_floating_ip my-digitalocean-config floating_ip='45.55.96.47'
     '''

salt/grains/core.py

@@ -2446,7 +2446,7 @@ def default_gateway():
         ip_gw: True   # True if either of the above is True, False otherwise
     '''
     grains = {}
-    if not salt.utils.which('ip'):
+    if not salt.utils.path.which('ip'):
         return {}
     grains['ip_gw'] = False
     grains['ip4_gw'] = False

salt/modules/boto_sqs.py

@@ -78,7 +78,7 @@ def __virtual__():
     '''
     if not HAS_BOTO3:
         return (False, 'The boto_sqs module could not be loaded: boto3 libraries not found')
-    __utils__['boto3.assign_funcs'](__name__, 'sqs', pack=__salt__)
+    __utils__['boto3.assign_funcs'](__name__, 'sqs')
     return True
 
 

salt/modules/panos.py

@@ -926,6 +926,30 @@ def get_platform():
     return __proxy__['panos.call'](query)
 
 
+def get_security_rule(rulename=None, vsys='1'):
+    '''
+    Get the candidate configuration for the specified rule.
+
+    rulename(str): The name of the security rule.
+
+    vsys(str): The string representation of the VSYS ID.
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' panos.get_security_rule rule01
+        salt '*' panos.get_security_rule rule01 3
+
+    '''
+    query = {'type': 'config',
+             'action': 'get',
+             'xpath': '/config/devices/entry[@name=\'localhost.localdomain\']/vsys/entry[@name=\'vsys{0}\']/'
+             'rulebase/security/rules/entry[@name=\'{1}\']'.format(vsys, rulename)}
+
+    return __proxy__['panos.call'](query)
+
+
 def get_session_info():
     '''
     Show device session statistics.

salt/modules/win_path.py

@@ -51,7 +51,7 @@ def rehash():
 
     CLI Example:
 
-    ... code-block:: bash
+    .. code-block:: bash
 
         salt '*' win_path.rehash
     '''

salt/modules/zk_concurrency.py

@@ -185,7 +185,7 @@ def lock_holders(path,
 
     Example:
 
-    ... code-block: bash
+    .. code-block: bash
 
         salt minion zk_concurrency.lock_holders /lock/path host1:1234,host2:1234
     '''
@@ -237,7 +237,7 @@ def lock(path,
 
     Example:
 
-    ... code-block: bash
+    .. code-block: bash
 
         salt minion zk_concurrency.lock /lock/path host1:1234,host2:1234
     '''
@@ -298,7 +298,7 @@ def unlock(path,
 
     Example:
 
-    ... code-block: bash
+    .. code-block: bash
 
         salt minion zk_concurrency.unlock /lock/path host1:1234,host2:1234
     '''
@@ -348,7 +348,7 @@ def party_members(path,
 
     Example:
 
-    ... code-block: bash
+    .. code-block: bash
 
         salt minion zk_concurrency.party_members /lock/path host1:1234,host2:1234
         salt minion zk_concurrency.party_members /lock/path host1:1234,host2:1234 min_nodes=3 blocking=True

salt/runners/git_pillar.py

@@ -28,6 +28,11 @@ def update(branch=None, repo=None):
         fetched, and ``False`` if there were errors or no new commits were
         fetched.
 
+    .. versionchanged:: Oxygen
+        The return for a given git_pillar remote will now be ``None`` when no
+        changes were fetched. ``False`` now is reserved only for instances in
+        which there were errors.
+
     Fetch one or all configured git_pillar remotes.
 
     .. note::

salt/spm/__init__.py

@@ -25,14 +25,16 @@
 import salt.config
 import salt.loader
 import salt.cache
-import salt.utils.files
-import salt.utils.http as http
 import salt.syspaths as syspaths
 from salt.ext import six
 from salt.ext.six import string_types
 from salt.ext.six.moves import input
 from salt.ext.six.moves import filter
 from salt.template import compile_template
+import salt.utils.files
+import salt.utils.http as http
+import salt.utils.platform
+import salt.utils.win_functions
 from salt.utils.yamldumper import SafeOrderedDumper
 
 # Get logging started
@@ -493,9 +495,7 @@ def _install_indv_pkg(self, pkg_name, pkg_file):
 
         # No defaults for this in config.py; default to the current running
         # user and group
-        import salt.utils
-        if salt.utils.is_windows():
-            import salt.utils.win_functions
+        if salt.utils.platform.is_windows():
             uname = gname = salt.utils.win_functions.get_current_user()
             uname_sid = salt.utils.win_functions.get_sid_from_name(uname)
             uid = self.opts.get('spm_uid', uname_sid)