On 02 Jul 14:33, Stuart Henderson wrote:
> sysutils/salt cannot import name 'linux_distribution' from
> 'platform'
> -> https://github.com/saltstack/salt/issues/55310
> -> "no longer referenced in Salt code as of the upcoming 3001 (Sodium)
> release"
> -> probably fixed with https://github.com/saltstack/salt/commit/fe075aaace
Hi Stuart,
I sent a diff for salt-3001 to Florian, Robert, Raf and Jasper but not to
ports (see below). If the diff gets in that should be solved.
mbk Uwe
################################################################################
>From uwe.wer...@retiolum.eu Wed Jul 1 00:31:32 2020
Date: Wed, 1 Jul 2020 00:31:32 +0000
From: Uwe Werler <uwe.wer...@retiolum.eu>
To: Florian Obser <flor...@openbsd.org>
Cc: Robert Nagy <rob...@openbsd.org>, Raf Czlonka <rczlo...@gmail.com>,
jas...@openbsd.org
Subject: salt-3001
Message-ID: <20200701003128.wlv3mzqdczxjll7k@FT-BM764M2.hagstofa.local>
X-Phone: +354.7806993 / SMS welcome
References: <20200514113455.5kpdi7xyn7rup...@imap.narrans.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200514113455.5kpdi7xyn7rup...@imap.narrans.de>
Status: RO
Content-Length: 41210
Lines: 612
Hi guys,
attached the update to salt-3001.
What about Florian's diff "salt & openbsd package branch names"?
Tested on my salt-dev and seems to work so far.
mbk Uwe
--
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/salt/Makefile,v
retrieving revision 1.143
diff -u -p -r1.143 Makefile
--- Makefile 20 May 2020 12:38:20 -0000 1.143
+++ Makefile 1 Jul 2020 00:22:53 -0000
@@ -17,9 +17,8 @@
COMMENT = remote execution and configuration management system
-MODPY_EGG_VERSION = 3000.3
+MODPY_EGG_VERSION = 3001
DISTNAME = salt-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = sysutils net devel
@@ -45,7 +44,8 @@ RUN_DEPENDS = net/py-msgpack${MODPY_FLA
textproc/py-MarkupSafe${MODPY_FLAVOR} \
textproc/py-yaml${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
- www/py-requests${MODPY_FLAVOR}
+ www/py-requests${MODPY_FLAVOR} \
+ sysutils/py-distro${MODPY_FLAVOR}
# requirements/zeromq.txt
RUN_DEPENDS += net/py-zmq${MODPY_FLAVOR} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/salt/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- distinfo 14 May 2020 16:47:27 -0000 1.50
+++ distinfo 1 Jul 2020 00:22:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (salt-3000.3.tar.gz) = /MpJmF5pfZFOWn80sv2LvYM7z3d50wF0onmk3iKUzqc=
-SIZE (salt-3000.3.tar.gz) = 15237557
+SHA256 (salt-3001.tar.gz) = XKYNGyzI5j21CZW9ixF5FO6vV8SM4rOjcx7lcWOt8VQ=
+SIZE (salt-3001.tar.gz) = 14448043
Index: patches/patch-requirements_crypto_txt
===================================================================
RCS file: /cvs/ports/sysutils/salt/patches/patch-requirements_crypto_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-requirements_crypto_txt
--- patches/patch-requirements_crypto_txt 14 May 2020 16:47:28 -0000
1.1
+++ patches/patch-requirements_crypto_txt 1 Jul 2020 00:22:53 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-requirements_crypto_txt,v 1.1 2020/05/14 16:47:28 florian Exp $
+$OpenBSD$
Index: requirements/crypto.txt
--- requirements/crypto.txt.orig
+++ requirements/crypto.txt
-@@ -1,2 +1 @@
--pycrypto>=2.6.1; sys.platform not in 'win32,darwin'
- pycryptodomex; sys.platform == 'win32'
+@@ -1 +1 @@
+-pycryptodomex>=3.9.7
++pycryptodomex>=3.9.7; sys.platform == 'win32'
Index: patches/patch-salt_modules_file_py
===================================================================
RCS file: patches/patch-salt_modules_file_py
diff -N patches/patch-salt_modules_file_py
--- patches/patch-salt_modules_file_py 20 May 2020 12:38:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-salt_modules_file_py,v 1.1 2020/05/20 12:38:20 jasper Exp $
-
-Fix deprecation warnings; from multiple upstream commits
-
-Index: salt/modules/file.py
---- salt/modules/file.py.orig
-+++ salt/modules/file.py
-@@ -29,7 +29,8 @@ import time
- import glob
- import hashlib
- import mmap
--from collections import Iterable, Mapping, namedtuple
-+from collections import namedtuple
-+from collections.abc import Iterable, Mapping
- from functools import reduce # pylint: disable=redefined-builtin
-
- # pylint: disable=import-error,no-name-in-module,redefined-builtin
Index: patches/patch-salt_modules_salt_proxy_py
===================================================================
RCS file: /cvs/ports/sysutils/salt/patches/patch-salt_modules_salt_proxy_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-salt_modules_salt_proxy_py
--- patches/patch-salt_modules_salt_proxy_py 14 May 2020 16:47:28 -0000
1.3
+++ patches/patch-salt_modules_salt_proxy_py 1 Jul 2020 00:22:53 -0000
@@ -7,12 +7,12 @@ given proxy isn't running and fork off a
Index: salt/modules/salt_proxy.py
--- salt/modules/salt_proxy.py.orig
+++ salt/modules/salt_proxy.py
-@@ -75,7 +75,7 @@ def _is_proxy_running(proxyname):
- '''
+@@ -79,7 +79,7 @@ def _is_proxy_running(proxyname):
+ """
Check if proxy for this name is running
- '''
-- cmd = ('ps ax | grep "salt-proxy --proxyid={0}" | grep -v grep'
-+ cmd = ('ps axww | grep "salt-proxy --proxyid={0}" | grep -v grep'
- .format(salt.ext.six.moves.shlex_quote(proxyname)))
- cmdout = __salt__['cmd.run_all'](
- cmd,
+ """
+- cmd = 'ps ax | grep "salt-proxy --proxyid={0}" | grep -v grep'.format(
++ cmd = 'ps axww | grep "salt-proxy --proxyid={0}" | grep -v grep'.format(
+ salt.ext.six.moves.shlex_quote(proxyname)
+ )
+ cmdout = __salt__["cmd.run_all"](cmd, timeout=5, python_shell=True)
Index: patches/patch-salt_modules_win_file_py
===================================================================
RCS file: patches/patch-salt_modules_win_file_py
diff -N patches/patch-salt_modules_win_file_py
--- patches/patch-salt_modules_win_file_py 20 May 2020 12:38:20 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-salt_modules_win_file_py,v 1.1 2020/05/20 12:38:20 jasper Exp $
-
-Fix deprecation warnings; from multiple upstream commits
-
-Index: salt/modules/win_file.py
---- salt/modules/win_file.py.orig
-+++ salt/modules/win_file.py
-@@ -17,7 +17,7 @@ import os.path
- import logging
- # pylint: disable=W0611
- import operator # do not remove
--from collections import Iterable, Mapping # do not remove
-+from collections.abc import Iterable, Mapping # do not remove
- from functools import reduce # do not remove
- import datetime # do not remove.
- import tempfile # do not remove. Used in salt.modules.file.__clean_tmp
Index: patches/patch-salt_returners_zabbix_return_py
===================================================================
RCS file:
/cvs/ports/sysutils/salt/patches/patch-salt_returners_zabbix_return_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-salt_returners_zabbix_return_py
--- patches/patch-salt_returners_zabbix_return_py 14 May 2020 16:47:28
-0000 1.2
+++ patches/patch-salt_returners_zabbix_return_py 1 Jul 2020 00:22:53
-0000
@@ -1,15 +1,17 @@
$OpenBSD: patch-salt_returners_zabbix_return_py,v 1.2 2020/05/14 16:47:28
florian Exp $
Index: salt/returners/zabbix_return.py
---- salt/returners/zabbix_return.py.orig Wed Feb 5 11:27:41 2020
-+++ salt/returners/zabbix_return.py Wed Feb 5 11:28:12 2020
-@@ -40,8 +40,8 @@ def zbx():
- zabbix_sender = '/usr/local/zabbix/bin/zabbix_sender'
- zabbix_config = '/usr/local/zabbix/etc/zabbix_agentd.conf'
+--- salt/returners/zabbix_return.py.orig
++++ salt/returners/zabbix_return.py
+@@ -42,10 +42,10 @@ def zbx():
+ zabbix_sender = "/usr/local/zabbix/bin/zabbix_sender"
+ zabbix_config = "/usr/local/zabbix/etc/zabbix_agentd.conf"
return {"sender": zabbix_sender, "config": zabbix_config}
-- elif os.path.exists('/usr/bin/zabbix_sender') and
os.path.exists('/etc/zabbix/zabbix_agentd.conf'):
+- elif os.path.exists("/usr/bin/zabbix_sender") and os.path.exists(
++ elif os.path.exists("${LOCALBASE}/bin/zabbix_sender") and os.path.exists(
+ "/etc/zabbix/zabbix_agentd.conf"
+ ):
- zabbix_sender = "/usr/bin/zabbix_sender"
-+ elif os.path.exists('${LOCALBASE}/bin/zabbix_sender') and
os.path.exists('/etc/zabbix/zabbix_agentd.conf'):
+ zabbix_sender = "${LOCALBASE}/bin/zabbix_sender"
zabbix_config = "/etc/zabbix/zabbix_agentd.conf"
return {"sender": zabbix_sender, "config": zabbix_config}
Index: patches/patch-salt_utils_network_py
===================================================================
RCS file: /cvs/ports/sysutils/salt/patches/patch-salt_utils_network_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-salt_utils_network_py
--- patches/patch-salt_utils_network_py 14 May 2020 16:47:28 -0000 1.4
+++ patches/patch-salt_utils_network_py 1 Jul 2020 00:22:53 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-salt_utils_network_py,v
Index: salt/utils/network.py
--- salt/utils/network.py.orig
+++ salt/utils/network.py
-@@ -1629,7 +1629,7 @@ def _openbsd_remotes_on(port, which_end):
- log.error('Failed netstat')
+@@ -1819,7 +1819,7 @@ def _openbsd_remotes_on(port, which_end):
+ log.error("Failed netstat")
raise
-- lines = data.split('\n')
+- lines = data.split("\n")
+ lines = salt.utils.stringutils.to_str(data).split('\n')
for line in lines:
- if 'ESTABLISHED' not in line:
+ if "ESTABLISHED" not in line:
continue
Index: patches/patch-salt_utils_oset_py
===================================================================
RCS file: patches/patch-salt_utils_oset_py
diff -N patches/patch-salt_utils_oset_py
--- patches/patch-salt_utils_oset_py 20 May 2020 12:38:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-salt_utils_oset_py,v 1.1 2020/05/20 12:38:20 jasper Exp $
-
-Fix deprecation warnings; from multiple upstream commits
-
-Index: salt/utils/oset.py
---- salt/utils/oset.py.orig
-+++ salt/utils/oset.py
-@@ -22,7 +22,7 @@ Rob Speer's changes are as follows:
- - added __getitem__
- '''
- from __future__ import absolute_import, unicode_literals, print_function
--import collections
-+from collections.abc import OrderedSet
-
- SLICE_ALL = slice(None)
- __version__ = '2.0.1'
-@@ -44,7 +44,7 @@ def is_iterable(obj):
- return hasattr(obj, '__iter__') and not isinstance(obj, str) and not
isinstance(obj, tuple)
-
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- An OrderedSet is a custom MutableSet that remembers its order, so that
- every entry has an index that can be looked up.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/salt/pkg/PLIST,v
retrieving revision 1.54
diff -u -p -r1.54 PLIST
--- pkg/PLIST 14 May 2020 16:47:28 -0000 1.54
+++ pkg/PLIST 1 Jul 2020 00:22:53 -0000
@@ -383,7 +383,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/defaults/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/defaults/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/salt/defaults/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/defaults/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/defaults/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/defaults/events.py
lib/python${MODPY_VERSION}/site-packages/salt/defaults/exitcodes.py
lib/python${MODPY_VERSION}/site-packages/salt/engines/
lib/python${MODPY_VERSION}/site-packages/salt/engines/__init__.py
@@ -673,6 +675,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}nxos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}opts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}panos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}pending_reboot.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}philips_hue.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}rest_sample.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}smartos.${MODPY_PYC_MAGIC_TAG}pyc
@@ -698,6 +701,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/grains/nxos.py
lib/python${MODPY_VERSION}/site-packages/salt/grains/opts.py
lib/python${MODPY_VERSION}/site-packages/salt/grains/panos.py
+lib/python${MODPY_VERSION}/site-packages/salt/grains/pending_reboot.py
lib/python${MODPY_VERSION}/site-packages/salt/grains/philips_hue.py
lib/python${MODPY_VERSION}/site-packages/salt/grains/rest_sample.py
lib/python${MODPY_VERSION}/site-packages/salt/grains/smartos.py
@@ -798,6 +802,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}azurearm_network.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}azurearm_resource.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}bamboohr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}baredoc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}bcache.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}beacons.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}bigip.${MODPY_PYC_MAGIC_TAG}pyc
@@ -842,8 +847,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}btrfs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cabal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}capirca_acl.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cassandra.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cassandra_cql.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cassandra_mod.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}celery.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}ceph.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}chassis.${MODPY_PYC_MAGIC_TAG}pyc
@@ -877,6 +882,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}debian_service.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}debuild_pkgbuild.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}devinfo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}devmap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}dig.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}disk.${MODPY_PYC_MAGIC_TAG}pyc
@@ -937,6 +943,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}haproxyconn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}hashutil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}heat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}helm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}hg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}highstate_doc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}hosts.${MODPY_PYC_MAGIC_TAG}pyc
@@ -973,6 +980,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}keystoneng.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}keystore.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}kmod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}kubeadm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}kubernetesmod.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}launchctl_service.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}layman.${MODPY_PYC_MAGIC_TAG}pyc
@@ -985,6 +993,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}linux_acl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}linux_ip.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}linux_lvm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}linux_service.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}linux_shadow.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}linux_sysctl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}localemod.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}locate.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1071,6 +1081,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}nspawn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}nxos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}nxos_api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}nxos_upgrade.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}omapi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}openbsd_sysctl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}openbsdpkg.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1160,9 +1171,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}sensehat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}sensors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}serverdensity_device.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}servicenow.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}shadow.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}slack_notify.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}slsutil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}smartos_imgadm.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1314,6 +1323,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_network.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_resource.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/bamboohr.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/baredoc.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/bcache.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/beacons.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/bigip.py
@@ -1358,8 +1368,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/btrfs.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/cabal.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/capirca_acl.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/cassandra.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/cassandra_cql.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/cassandra_mod.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/celery.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/ceph.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/chassis.py
@@ -1393,6 +1403,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/debian_service.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/debuild_pkgbuild.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/defaults.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/devinfo.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/devmap.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/dig.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/disk.py
@@ -1453,6 +1464,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/haproxyconn.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/hashutil.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/heat.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/helm.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/hg.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/highstate_doc.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/hosts.py
@@ -1507,6 +1519,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/keystoneng.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/keystore.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/kmod.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/kubeadm.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/kubernetesmod.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/launchctl_service.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/layman.py
@@ -1519,6 +1532,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/linux_acl.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/linux_ip.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/linux_lvm.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/linux_service.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/linux_shadow.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/linux_sysctl.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/localemod.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/locate.py
@@ -1605,6 +1620,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/nspawn.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos_api.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos_upgrade.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/omapi.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsd_sysctl.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdpkg.py
@@ -1694,9 +1710,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/modules/sensehat.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/sensors.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/serverdensity_device.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/service.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/servicenow.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/shadow.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/slack_notify.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/slsutil.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/smartos_imgadm.py
@@ -1900,6 +1914,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/pillar/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}azureblob.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}cmd_json.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}cmd_yaml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}cmd_yamlex.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1947,6 +1962,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}venafi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}virtkey.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}vmware_pillar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/pillar/azureblob.py
lib/python${MODPY_VERSION}/site-packages/salt/pillar/cmd_json.py
lib/python${MODPY_VERSION}/site-packages/salt/pillar/cmd_yaml.py
lib/python${MODPY_VERSION}/site-packages/salt/pillar/cmd_yamlex.py
@@ -2077,6 +2093,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}pydsl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}pyobjects.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}stateconf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}toml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}wempy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}yaml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/renderers/${MODPY_PYCACHE}yamlex.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2097,6 +2114,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/renderers/pydsl.py
lib/python${MODPY_VERSION}/site-packages/salt/renderers/pyobjects.py
lib/python${MODPY_VERSION}/site-packages/salt/renderers/stateconf.py
+lib/python${MODPY_VERSION}/site-packages/salt/renderers/toml.py
lib/python${MODPY_VERSION}/site-packages/salt/renderers/wempy.py
lib/python${MODPY_VERSION}/site-packages/salt/renderers/yaml.py
lib/python${MODPY_VERSION}/site-packages/salt/renderers/yamlex.py
@@ -2104,6 +2122,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/returners/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}appoptics_return.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}carbon_return.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}cassandra_cql_return.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}cassandra_return.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2143,6 +2162,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}telegram_return.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}xmpp_return.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}zabbix_return.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/returners/appoptics_return.py
lib/python${MODPY_VERSION}/site-packages/salt/returners/carbon_return.py
lib/python${MODPY_VERSION}/site-packages/salt/returners/cassandra_cql_return.py
lib/python${MODPY_VERSION}/site-packages/salt/returners/cassandra_return.py
@@ -2339,6 +2359,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}configparser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}json.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}msgpack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}toml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/serializers/${MODPY_PYCACHE}yaml.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2346,6 +2367,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/serializers/configparser.py
lib/python${MODPY_VERSION}/site-packages/salt/serializers/json.py
lib/python${MODPY_VERSION}/site-packages/salt/serializers/msgpack.py
+lib/python${MODPY_VERSION}/site-packages/salt/serializers/plist.py
lib/python${MODPY_VERSION}/site-packages/salt/serializers/python.py
lib/python${MODPY_VERSION}/site-packages/salt/serializers/toml.py
lib/python${MODPY_VERSION}/site-packages/salt/serializers/yaml.py
@@ -2427,6 +2449,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}boto_sqs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}boto_vpc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}bower.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}btrfs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}cabal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}ceph.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}chef.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2485,6 +2508,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}grains.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}heat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}helm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}hg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}highstate_doc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}host.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2584,6 +2608,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}npm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}nxos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}nxos_upgrade.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}openstack_config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}openvswitch_bridge.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}openvswitch_port.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2773,6 +2798,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/states/boto_sqs.py
lib/python${MODPY_VERSION}/site-packages/salt/states/boto_vpc.py
lib/python${MODPY_VERSION}/site-packages/salt/states/bower.py
+lib/python${MODPY_VERSION}/site-packages/salt/states/btrfs.py
lib/python${MODPY_VERSION}/site-packages/salt/states/cabal.py
lib/python${MODPY_VERSION}/site-packages/salt/states/ceph.py
lib/python${MODPY_VERSION}/site-packages/salt/states/chef.py
@@ -2831,6 +2857,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/states/grains.py
lib/python${MODPY_VERSION}/site-packages/salt/states/group.py
lib/python${MODPY_VERSION}/site-packages/salt/states/heat.py
+lib/python${MODPY_VERSION}/site-packages/salt/states/helm.py
lib/python${MODPY_VERSION}/site-packages/salt/states/hg.py
lib/python${MODPY_VERSION}/site-packages/salt/states/highstate_doc.py
lib/python${MODPY_VERSION}/site-packages/salt/states/host.py
@@ -2930,6 +2957,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/states/npm.py
lib/python${MODPY_VERSION}/site-packages/salt/states/ntp.py
lib/python${MODPY_VERSION}/site-packages/salt/states/nxos.py
+lib/python${MODPY_VERSION}/site-packages/salt/states/nxos_upgrade.py
lib/python${MODPY_VERSION}/site-packages/salt/states/openstack_config.py
lib/python${MODPY_VERSION}/site-packages/salt/states/openvswitch_bridge.py
lib/python${MODPY_VERSION}/site-packages/salt/states/openvswitch_port.py
@@ -3246,6 +3274,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}napalm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}nb_popen.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}nxos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}nxos_api.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}odict.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}oset.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3301,6 +3330,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}vt.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}vt_helper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_dacl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_dotnet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_functions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_lgpo_auditpol.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_lgpo_netsh.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3309,6 +3339,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_pdh.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_reg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_runas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_system.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_update.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}winapi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}xdg.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3349,31 +3380,29 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}jinja.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/jinja.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/path.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/signature.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/state.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/dictdiffer.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/dicttrim.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/dictupdate.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/dns.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/doc.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/container.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/helpers.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/network.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/container.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/helpers.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/dockermod/translate/network.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/environment.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/error.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/etcd_util.py
@@ -3420,6 +3449,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/utils/napalm.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/nb_popen.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/network.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/nxos.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/nxos_api.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/odict.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/openstack/
@@ -3513,6 +3543,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/utils/vt.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/vt_helper.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_dacl.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/win_dotnet.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_functions.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_lgpo_auditpol.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_lgpo_netsh.py
@@ -3521,6 +3552,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_pdh.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_reg.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_runas.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/win_system.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/win_update.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/winapi.py
lib/python${MODPY_VERSION}/site-packages/salt/utils/xdg.py
--
