CVS commit: pkgsrc/sysutils

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Nov 14 20:01:17 UTC 2021

Modified Files:
        pkgsrc/sysutils/salt: Makefile PLIST distinfo
        pkgsrc/sysutils/salt-docs: Makefile distinfo
        pkgsrc/sysutils/salt/patches: patch-salt_version.py

Log Message:
salt salt-docs: updated to 3004

SALT 3004 RELEASE NOTES - CODENAME SILICON

NEW FEATURES
TRANSACTIONAL SYSTEM SUPPORT (MICROOS)

A transactional system, like MicroOS, can present some challenges when the user decided to manage it via Salt.

MicroOS provide a read-only rootfs and a tool, transactional-update, that takes care of the management of the system (updating, upgrading, installation or reboot, among others) in an atomic way.

Atomicity is the main feature of MicroOS, and to guarantee this property, this model leverages snapper, zypper, btrfs and overlayfs to create snapshots that will be updated independently of the 
currently running system, and that are activated after the reboot. This implies, for example, that some changes made on the system are not visible until the next reboot, as those changes are living 
in a different snapshot of the file system.

Salt 3004 (Silicon) support this type of system via two new modules (transactional_update and rebootmgr) and a new executor (transactional_update).

The new modules will provide all the low level API for interacting with transactional systems, like defining a mantenance window where the system is free to reboot and activate the new state, or 
install new software in a new transaction. It will also provide hight level of abstractions that will allows us to execute Salt module functions or applying states inside new transactions.

The execution module will help us to treat the transactional system transparently (like the traditional ones), using a mechanism that will delegate some Salt modules execution into the new 
transactional_update module.

REMOVED
Removed the deprecated glance state and execution module in favor of the glance_image state module and the glanceng execution module.

Removed support for Ubuntu 16.04

Removed the deprecated support for gid_from_name from the user state module

Removed deprecated virt.migrate_non_shared, virt.migrate_non_shared_inc, ssh from virt.migrate, and python2/python3 args from salt.utils.thin.gen_min and .gen_thin

DEPRECATED
The _ext_nodes alias to the master_tops function was added back in 3004 to maintain backwards compatibility with older supported versions. This alias will now be removed in 3006. This change will 
break Master and Minion communication compatibility with Salt minions running versions 3003 and lower.

utils/boto3_elasticsearch is no longer needed

Changed "manufacture" grain to "manufacturer" for Solaris on SPARC to unify the name across all platforms. The old "manufacture" grain is now deprecated and will be removed in Sulfur

Deprecate salt.payload.Serial

CHANGED
Changed nginx.version to return version without nginx/ prefix.

Updated Slack webhook returner to support event returns on salt-master

Parsing Epoch out of version during pkg remove, since yum can't handle that in all of the cases.

Add extra onfail req check in the state engine to allow onfail to be used with onchanges and other reqs in the same state

Changed the default character set used by utils.pycrypto.secure_password() to include symbols and implemented arguments to control the used character set.

FIXED
Set default 'bootstrap_delay' to 0

Fixed issue where multiple args to netapi were not preserved

Handle all repo formats in the aptpkg module.

Do not break master_tops for minion with version lower to 3003 This is going to be removed in Salt 3006 (Sulfur)

Reverting changes in 60150. Updating installed and removed functions to return changes when test=True.

Handle signals and properly exit, instead of raising exceptions.

Redirect imports of salt.ext.six to six

Surface strerror to user state instead of returning false

Fixing _get_envs() to preserve the order of pillar_roots. _get_envs() returned pillar_roots in a non-deterministic order.

Fixes salt-cloud KeyError that occurs when there exists any subnets with no tags when profiles use subnetname

Fixes postgres_local_cache by removing duplicate unicode encoding.

Fixing the state aggregation system to properly handle requisities. Fixing pkg state to exclude packages from aggregation if the hold attribute is in the state.

fix issue that allows case sensitive files to be carried through

Allow GCE Salt Cloud to use previously created IP Addresses.

Fixing rabbitmq.list_user_permissions to ensure we are returning a permission list with three elements even when some values are empty.

Periodically restart the fileserver update process to avoid leaks

Fix default value to dictionary for mine_function

Allow user.present to work on Alpine Linux by fixing linux_shadow.info

Ensure that zypper is called with only one --no-refresh parameter

Fixed fileclient cachedir path switching from master to minion due to incorrect MasterMinion configuration

Fixed the container detection inside virtual machines

Fix invalid dnf command when obsoletes=True in pkg.update function

Jinja renderer resolves wrong relative paths when importing subdirectories

Fixed bug 55262 where salt.modules.iptables would call cmd.run and receive and interpret interspersed stdout and stderr output from subprocesses.

Updated pcs support to handle auth and setup for new syntax supporting version 0.10

Reinstate ignore_cidr option in salt-cloud openstack driver

Fix for network.wolmatch runner displaying 'invalid arguments' error with valid arguements

Fixed bug 57490, which prevented package installation for Open Euler and Issabel PBX. Both Open Euler and Issabel PBX use Yum for package management, added them to yumpkg.py.

Better handling of bad RSA public keys from minions

Fixing various functions in the file state module that use user.info to get group information, certain hosts particularly proxy minions do not have the user.info function avaiable.

Do not monkey patch yaml loaders: Prevent breaking Ansible filter modules

Fix --subset command line option, and support old 'sub' parameter name in cmd_subset for backwards compatibility

When calling salt.utils.http.query with a HEAD method to check for the existence of a source ensure that decode_body is False, so the file is not downloaded into memory when we don't need the 
contents.

Update the runas user on freebsd for postgres versions >9.5, since freebsd will be removing the package on 2021-05-13.

Fix pip module linked requirements file parsing

Fix incorrect hostname quoting in /etc/sysconfig/networking on Red Hat family OS.

Fix Xen DomU virt detection in grains for long running machines.

add encoding when windows encoding is not defaulting to utf8

Fix "aptpkg.normalize_name" in case the arch is "all" for DEB packages

Astra Linux now considered a Debian family distro

Reworking the mysql module and state so that passwordless does not try to use unix_socket until unix_socket is set to True.

Fixed the zabbix module to read the connection data from pillar.

Fix crash on "yumpkg" execution module when unexpected output at listing patches

Remove return that had left over py2 code from win_path.py

Don't create spicevmc channel for Xen virtual machines

Fix win_servermanager.install so it will reboot when restart=True is passed

Clear the cached network interface grains during minion init and grains refresh

Normalized grain output for LXC containers

Fix typo in 'salt/states/cmd.py' to use "comment" instead of "commnd".

add aliyun linux support and set alinux as redhat family

Don't fail updating network without netmask ip attribute

Fixed using reserved keyword 'set' as function argument in modules/ipset.py

Return empty changes when nothing has been done in virt.defined and virt.running states

Import salt.utils.azurearm instead of using __utils__ from loader in azure cloud. This fixes an issue where __utils__ would become unavailable when we are using the ThreadPool in azurearm.

Fix an issue with the LGPO module when the gpt.ini file contains unix style line endings (/n). This was happening on a Windows Server 2019 instance created in Google Cloud Platform (GCP).

The ansiblegate module now correctly passes keyword arguments to Ansible module calls

Make sure cmdmod._log_cmd handles tuples properly

Updating the add, delete, modify, enable_job, and disable_job functions to return appropriate changes.

Apply pre-commit changes to entire codebase.

Fix Hetzner cloud driver does not recognize machines when rolling out a map

Update Windows build deps & DLLs, Use Python 3.8, libsodium.dll 1.0.18, OpenSSL dlls to 1.1.1k

Salt api verifies proper log file path when providing '--log-file' from the cli

Detect Mendel Linux as Debian

Fixed compilation of requisite_ins by also checking state type along with name/id

Fix xen._get_vm() to not break silently when a VM and a template on XenServer have the same name.

Added missing space for nftables.build_rule when using saddr or daddr.

Add back support to load old entrypoints by iterating instead of type checking

Fixed interrupting salt-call in a pdb session.

Validate we can import map files in states

Update alter_db to return True or False depending on the success of failure of the alter. Update grant_exists to only use the full list of available privileges when the grant is on the global level, 
eg. datbase is ".".

Fixed firewalld.list_zones when any "rich rules" is set

IPCMessageSubscriber objects expose their connect method as a corotine so they can be wrapped by SyncWrapper.

Allow for Napalm dependency netmiko_mod to load correctly when used by Napalm with Cisco IOS

Ensure proper access to the created temporary file when runas is passed to cmd.exec_code_all

Fixed an IndexError in pkgng.latest_version when querying an unknown package.

Fixed pkgng.latest_version when querying by origin (e.g. "shells/bash").

Gracefuly handle errors in virt.vm_info

The LGPO Module now uses "Success and Failure" for normal audit settings and advanced audit settings

Fixing tests/pytests/unit/utils/scheduler/test_eval.py tests so the sleep happens before the status, so the job is given time before we check it.

Update the external ipaddress to the latest 3.9.5 version which has some security fixes. Updating the compat.p to use the vendored version if the python version is below 3.9.5 and only run the 
test_ipaddress.py tests if below 3.9.5.

Fixed ValueError exception in state.show_state_usage

Redact the username and password when something goes wrong when using an HTTP source and we raise an exception.

Inject the Ansible functions into Salt's ansiblegate module which was broken on the 3001 release.

Figure out the available Python version inside containers when executing "dockermod.call" function

Handle IPv6 route types such as anycast, multicast, etc when returned from IPv6 route table queries

Move the commonly used code that converts a list to a dictionary into salt.utils.beacons. Fixing inotify beacon close function to ensure the configuration is converted from the provided list format 
into a dictionary.

Set name of engine subprocesses

Properly discover block devices path in virt.running

Avoid exceptions when handling some exception cases.

Fixed faulty error message in npm.installed state.

Port option reinstated for Junos Proxy (accidentally removed)

Now hosts.rm_host can remove entries from /etc/hosts when this file have inline comments.

Fixes issue where the full same name is not used when making rights assignments with group policy

Fixed zabbix_host.present to not overwrite inventory_mode to "manual" everytime inventory is updated.

Allowed zabbix_host.present to do partial updates of inventory, also don't erase everything if inventory is missing in state definition.

Fixing the mysql_cache module to handle binary inserting binary data into the database. Initially adding tests.

Fixed host_inventory_get to not throw an exception if host does not exist

Check for /dev/kvm to detect KVM hypervisor.

Fixing file.accumulated handling of dependencies when the state_id is used instead of {function: state_id} format.

Adding the ability for yumpkg.remove to handle package names with widdcards.

Pass emulator path to get guest capabilities from libvirt

virt.get_disks: properly report qemu-img errors

Make all platforms have psutils. This prevents a minion from starting if an instance is all ready running.

Ignore configuration for 'enable_fqdns_grains' for AIX, Solaris and Juniper, assume False

Remove check for TIAMAT_BUILD enforcing USE_STATIC_REQUIREMENTS, this is now controled by Tiamat v7.10.1 and above

Have the beacon call run through a try...except, catching any errors, logging and firing an event that includes the error. Fixing the swapusage beacon to ensure value is a string before we attempt to 
filter out the %.

Refactor loader into logical sub-modules

Clean up references to ZMQDefaultLoop

change dep warn from Silicon to Phosphorus for the cmd,show,system_info and add_config functions in the nxos module.

Fix bug 60602 where the hetzner cloud provider isn't recognized correctly

Fix the pwd.getpwnam caching issue on macOS user module

Fixing beacons that can include a value in their configuration that may or may not included a percentage. We want to handle the situation where the percentage sign is not included and the value is 
not handled as a string.

Fix RuntimeError in process manager

Ensure all data that is being passed along to LDAP is in an OrderedSet and contains bytes.

Update the AWS API version so VMs spun up by salt-cloud where the VPC has it enabled to assign ipv6 addresses by default, actually get ipv6 addresses assigned by default.

Remove un-needed singletons from tranports

ADDED
Add windows support for file.patch with patch.exe from git for windows optional packages

Added ability to pass exclude kwarg to salt.state inside orchestrate.

Added success_stdout and success_stderr arguments to cmd.run, to override default return code behavior.

The netbox pillar now been enhanced to add support for querying virtual machines (in addition to devices), as well as minion interfaces and associated IP addresses.

Add support for transactional systems, like openSUSE MicroOS

Added namespace headers to allow use of namespace from config to communicate with Vault Enterprise namespaces

boto3mod unit tests

New decorators allow_one_of() and require_one_of()

Added nosync switch to disable initial raid synchronization

Expanded the documentation for the netbox pillar.

Rocky Linux has been added to the RedHat os_family.

Add "poudriere -i -j jail_name" option to list jail information for poudriere

Added the grains.uuid on Windows platform

Add a salt.util.platform check to detect the AArch64 64-bit extension of the ARM architecture.

Adding support for Deltaproxy controlled proxy minions into Salt Open.

Added functions to slsutil execution module to test if files exist in the state tree Added funtion to slsutil execution module to search for a file by walking up the state tree

Allow module_refresh to also refresh available beacons, eg. following a Python library being installed and "refresh_modules" being passed as an argument in a state.

Add the detect_remote_minions and remote_minions_port options to allow the master to detect remote ports for connected minions. This will allow users to detect Heist-Salt minions the master is 
connected to over port 22 by default.

Add the python rpm-vercmp library in the rpm_lowpkg.py module.

Allow a user to use the aptpkg.py module without installing python-apt.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/salt/PLIST
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/salt/distinfo
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/salt-docs/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/salt-docs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/salt/patches/patch-salt_version.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.73 pkgsrc/sysutils/salt/Makefile:1.74
--- pkgsrc/sysutils/salt/Makefile:1.73  Tue Aug 18 05:26:08 2020
+++ pkgsrc/sysutils/salt/Makefile       Sun Nov 14 20:01:17 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2020/08/18 05:26:08 tnn Exp $
+# $NetBSD: Makefile,v 1.74 2021/11/14 20:01:17 adam Exp $
 
-DISTNAME=      salt-2019.2.2
+DISTNAME=      salt-3004
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
 
@@ -9,23 +9,21 @@ HOMEPAGE=     http://saltstack.org/
 COMMENT=       Remote execution and configuration management system
 LICENSE=       apache-2.0
 
+DEPENDS+=      ${PYPKGPREFIX}-cryptodome>=3.9.8:../../security/py-cryptodome
+DEPENDS+=      ${PYPKGPREFIX}-distro>=1.0.1:../../devel/py-distro
 DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
-DEPENDS+=      ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
-DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=      ${PYPKGPREFIX}-msgpack>=0.5.6:../../devel/py-msgpack
+DEPENDS+=      ${PYPKGPREFIX}-psutil>=5.0.0:../../sysutils/py-psutil
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests
-DEPENDS+=      ${PYPKGPREFIX}-tornado>=4.3:../../www/py-tornado
-DEPENDS+=      ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
-# zeromq transport requirements
-DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
-DEPENDS+=      ${PYPKGPREFIX}-zmq>=2.2.0:../../net/py-zmq
+DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=      ${PYPKGPREFIX}-zmq>=19.0.2:../../net/py-zmq
 
-# Some modules are still not (as of 2019.2.0) 3.x compatible.
-PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+= ${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures
+.if ${_PYTHON_VERSION} == 36
+DEPENDS+=      ${PYPKGPREFIX}-contextvars-[0-9]*:../../devel/py-contextvars
 .endif
 
 BUILD_DEFS+=   VARBASE
@@ -85,5 +83,5 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
        ${INSTALL_DATA} ${WRKSRC}/conf/minion ${DESTDIR}${EGDIR}/
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/salt/PLIST
diff -u pkgsrc/sysutils/salt/PLIST:1.29 pkgsrc/sysutils/salt/PLIST:1.30
--- pkgsrc/sysutils/salt/PLIST:1.29     Wed Nov 13 14:47:59 2019
+++ pkgsrc/sysutils/salt/PLIST  Sun Nov 14 20:01:17 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2019/11/13 14:47:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2021/11/14 20:01:17 adam Exp $
 bin/salt
 bin/salt-api
 bin/salt-call
@@ -13,13 +13,31 @@ bin/salt-ssh
 bin/salt-syndic
 bin/salt-unity
 bin/spm
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/salt/__init__.py
 ${PYSITELIB}/salt/__init__.pyc
 ${PYSITELIB}/salt/__init__.pyo
 ${PYSITELIB}/salt/_compat.py
 ${PYSITELIB}/salt/_compat.pyc
 ${PYSITELIB}/salt/_compat.pyo
+${PYSITELIB}/salt/_logging/__init__.py
+${PYSITELIB}/salt/_logging/__init__.pyc
+${PYSITELIB}/salt/_logging/__init__.pyo
+${PYSITELIB}/salt/_logging/handlers.py
+${PYSITELIB}/salt/_logging/handlers.pyc
+${PYSITELIB}/salt/_logging/handlers.pyo
+${PYSITELIB}/salt/_logging/impl.py
+${PYSITELIB}/salt/_logging/impl.pyc
+${PYSITELIB}/salt/_logging/impl.pyo
+${PYSITELIB}/salt/_logging/mixins.py
+${PYSITELIB}/salt/_logging/mixins.pyc
+${PYSITELIB}/salt/_logging/mixins.pyo
 ${PYSITELIB}/salt/_syspaths.py
 ${PYSITELIB}/salt/_syspaths.pyc
 ${PYSITELIB}/salt/_syspaths.pyo
@@ -83,6 +101,9 @@ ${PYSITELIB}/salt/beacons/bonjour_announ
 ${PYSITELIB}/salt/beacons/btmp.py
 ${PYSITELIB}/salt/beacons/btmp.pyc
 ${PYSITELIB}/salt/beacons/btmp.pyo
+${PYSITELIB}/salt/beacons/cert_info.py
+${PYSITELIB}/salt/beacons/cert_info.pyc
+${PYSITELIB}/salt/beacons/cert_info.pyo
 ${PYSITELIB}/salt/beacons/diskusage.py
 ${PYSITELIB}/salt/beacons/diskusage.pyc
 ${PYSITELIB}/salt/beacons/diskusage.pyo
@@ -98,12 +119,15 @@ ${PYSITELIB}/salt/beacons/inotify.pyo
 ${PYSITELIB}/salt/beacons/journald.py
 ${PYSITELIB}/salt/beacons/journald.pyc
 ${PYSITELIB}/salt/beacons/journald.pyo
+${PYSITELIB}/salt/beacons/junos_rre_keys.py
+${PYSITELIB}/salt/beacons/junos_rre_keys.pyc
+${PYSITELIB}/salt/beacons/junos_rre_keys.pyo
 ${PYSITELIB}/salt/beacons/load.py
 ${PYSITELIB}/salt/beacons/load.pyc
 ${PYSITELIB}/salt/beacons/load.pyo
-${PYSITELIB}/salt/beacons/log.py
-${PYSITELIB}/salt/beacons/log.pyc
-${PYSITELIB}/salt/beacons/log.pyo
+${PYSITELIB}/salt/beacons/log_beacon.py
+${PYSITELIB}/salt/beacons/log_beacon.pyc
+${PYSITELIB}/salt/beacons/log_beacon.pyo
 ${PYSITELIB}/salt/beacons/memusage.py
 ${PYSITELIB}/salt/beacons/memusage.pyc
 ${PYSITELIB}/salt/beacons/memusage.pyo
@@ -125,6 +149,9 @@ ${PYSITELIB}/salt/beacons/proxy_example.
 ${PYSITELIB}/salt/beacons/ps.py
 ${PYSITELIB}/salt/beacons/ps.pyc
 ${PYSITELIB}/salt/beacons/ps.pyo
+${PYSITELIB}/salt/beacons/salt_monitor.py
+${PYSITELIB}/salt/beacons/salt_monitor.pyc
+${PYSITELIB}/salt/beacons/salt_monitor.pyo
 ${PYSITELIB}/salt/beacons/salt_proxy.py
 ${PYSITELIB}/salt/beacons/salt_proxy.pyc
 ${PYSITELIB}/salt/beacons/salt_proxy.pyo
@@ -146,6 +173,9 @@ ${PYSITELIB}/salt/beacons/smartos_vmadm.
 ${PYSITELIB}/salt/beacons/status.py
 ${PYSITELIB}/salt/beacons/status.pyc
 ${PYSITELIB}/salt/beacons/status.pyo
+${PYSITELIB}/salt/beacons/swapusage.py
+${PYSITELIB}/salt/beacons/swapusage.pyc
+${PYSITELIB}/salt/beacons/swapusage.pyo
 ${PYSITELIB}/salt/beacons/telegram_bot_msg.py
 ${PYSITELIB}/salt/beacons/telegram_bot_msg.pyc
 ${PYSITELIB}/salt/beacons/telegram_bot_msg.pyo
@@ -215,18 +245,12 @@ ${PYSITELIB}/salt/cli/ssh.pyo
 ${PYSITELIB}/salt/client/__init__.py
 ${PYSITELIB}/salt/client/__init__.pyc
 ${PYSITELIB}/salt/client/__init__.pyo
-${PYSITELIB}/salt/client/api.py
-${PYSITELIB}/salt/client/api.pyc
-${PYSITELIB}/salt/client/api.pyo
 ${PYSITELIB}/salt/client/mixins.py
 ${PYSITELIB}/salt/client/mixins.pyc
 ${PYSITELIB}/salt/client/mixins.pyo
 ${PYSITELIB}/salt/client/netapi.py
 ${PYSITELIB}/salt/client/netapi.pyc
 ${PYSITELIB}/salt/client/netapi.pyo
-${PYSITELIB}/salt/client/raet/__init__.py
-${PYSITELIB}/salt/client/raet/__init__.pyc
-${PYSITELIB}/salt/client/raet/__init__.pyo
 ${PYSITELIB}/salt/client/ssh/__init__.py
 ${PYSITELIB}/salt/client/ssh/__init__.pyc
 ${PYSITELIB}/salt/client/ssh/__init__.pyo
@@ -263,6 +287,9 @@ ${PYSITELIB}/salt/client/ssh/wrapper/pil
 ${PYSITELIB}/salt/client/ssh/wrapper/publish.py
 ${PYSITELIB}/salt/client/ssh/wrapper/publish.pyc
 ${PYSITELIB}/salt/client/ssh/wrapper/publish.pyo
+${PYSITELIB}/salt/client/ssh/wrapper/saltcheck.py
+${PYSITELIB}/salt/client/ssh/wrapper/saltcheck.pyc
+${PYSITELIB}/salt/client/ssh/wrapper/saltcheck.pyo
 ${PYSITELIB}/salt/client/ssh/wrapper/state.py
 ${PYSITELIB}/salt/client/ssh/wrapper/state.pyc
 ${PYSITELIB}/salt/client/ssh/wrapper/state.pyo
@@ -302,6 +329,9 @@ ${PYSITELIB}/salt/cloud/clouds/gce.pyo
 ${PYSITELIB}/salt/cloud/clouds/gogrid.py
 ${PYSITELIB}/salt/cloud/clouds/gogrid.pyc
 ${PYSITELIB}/salt/cloud/clouds/gogrid.pyo
+${PYSITELIB}/salt/cloud/clouds/hetzner.py
+${PYSITELIB}/salt/cloud/clouds/hetzner.pyc
+${PYSITELIB}/salt/cloud/clouds/hetzner.pyo
 ${PYSITELIB}/salt/cloud/clouds/joyent.py
 ${PYSITELIB}/salt/cloud/clouds/joyent.pyc
 ${PYSITELIB}/salt/cloud/clouds/joyent.pyo
@@ -317,9 +347,6 @@ ${PYSITELIB}/salt/cloud/clouds/lxc.pyo
 ${PYSITELIB}/salt/cloud/clouds/msazure.py
 ${PYSITELIB}/salt/cloud/clouds/msazure.pyc
 ${PYSITELIB}/salt/cloud/clouds/msazure.pyo
-${PYSITELIB}/salt/cloud/clouds/nova.py
-${PYSITELIB}/salt/cloud/clouds/nova.pyc
-${PYSITELIB}/salt/cloud/clouds/nova.pyo
 ${PYSITELIB}/salt/cloud/clouds/oneandone.py
 ${PYSITELIB}/salt/cloud/clouds/oneandone.pyc
 ${PYSITELIB}/salt/cloud/clouds/oneandone.pyo
@@ -359,6 +386,9 @@ ${PYSITELIB}/salt/cloud/clouds/softlayer
 ${PYSITELIB}/salt/cloud/clouds/softlayer_hw.py
 ${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyc
 ${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyo
+${PYSITELIB}/salt/cloud/clouds/tencentcloud.py
+${PYSITELIB}/salt/cloud/clouds/tencentcloud.pyc
+${PYSITELIB}/salt/cloud/clouds/tencentcloud.pyo
 ${PYSITELIB}/salt/cloud/clouds/vagrant.py
 ${PYSITELIB}/salt/cloud/clouds/vagrant.pyc
 ${PYSITELIB}/salt/cloud/clouds/vagrant.pyo
@@ -438,77 +468,15 @@ ${PYSITELIB}/salt/crypt.pyo
 ${PYSITELIB}/salt/daemons/__init__.py
 ${PYSITELIB}/salt/daemons/__init__.pyc
 ${PYSITELIB}/salt/daemons/__init__.pyo
-${PYSITELIB}/salt/daemons/flo/__init__.py
-${PYSITELIB}/salt/daemons/flo/__init__.pyc
-${PYSITELIB}/salt/daemons/flo/__init__.pyo
-${PYSITELIB}/salt/daemons/flo/caller.flo
-${PYSITELIB}/salt/daemons/flo/core.py
-${PYSITELIB}/salt/daemons/flo/core.pyc
-${PYSITELIB}/salt/daemons/flo/core.pyo
-${PYSITELIB}/salt/daemons/flo/dummy.py
-${PYSITELIB}/salt/daemons/flo/dummy.pyc
-${PYSITELIB}/salt/daemons/flo/dummy.pyo
-${PYSITELIB}/salt/daemons/flo/jobber.py
-${PYSITELIB}/salt/daemons/flo/jobber.pyc
-${PYSITELIB}/salt/daemons/flo/jobber.pyo
-${PYSITELIB}/salt/daemons/flo/maint.flo
-${PYSITELIB}/salt/daemons/flo/maint.py
-${PYSITELIB}/salt/daemons/flo/maint.pyc
-${PYSITELIB}/salt/daemons/flo/maint.pyo
-${PYSITELIB}/salt/daemons/flo/master.flo
-${PYSITELIB}/salt/daemons/flo/minion.flo
-${PYSITELIB}/salt/daemons/flo/reactor.py
-${PYSITELIB}/salt/daemons/flo/reactor.pyc
-${PYSITELIB}/salt/daemons/flo/reactor.pyo
-${PYSITELIB}/salt/daemons/flo/worker.flo
-${PYSITELIB}/salt/daemons/flo/worker.py
-${PYSITELIB}/salt/daemons/flo/worker.pyc
-${PYSITELIB}/salt/daemons/flo/worker.pyo
-${PYSITELIB}/salt/daemons/flo/zero.py
-${PYSITELIB}/salt/daemons/flo/zero.pyc
-${PYSITELIB}/salt/daemons/flo/zero.pyo
 ${PYSITELIB}/salt/daemons/masterapi.py
 ${PYSITELIB}/salt/daemons/masterapi.pyc
 ${PYSITELIB}/salt/daemons/masterapi.pyo
-${PYSITELIB}/salt/daemons/salting.py
-${PYSITELIB}/salt/daemons/salting.pyc
-${PYSITELIB}/salt/daemons/salting.pyo
-${PYSITELIB}/salt/daemons/test/__init__.py
-${PYSITELIB}/salt/daemons/test/__init__.pyc
-${PYSITELIB}/salt/daemons/test/__init__.pyo
-${PYSITELIB}/salt/daemons/test/plan/__init__.py
-${PYSITELIB}/salt/daemons/test/plan/__init__.pyc
-${PYSITELIB}/salt/daemons/test/plan/__init__.pyo
-${PYSITELIB}/salt/daemons/test/plan/actors.py
-${PYSITELIB}/salt/daemons/test/plan/actors.pyc
-${PYSITELIB}/salt/daemons/test/plan/actors.pyo
-${PYSITELIB}/salt/daemons/test/test_master.py
-${PYSITELIB}/salt/daemons/test/test_master.pyc
-${PYSITELIB}/salt/daemons/test/test_master.pyo
-${PYSITELIB}/salt/daemons/test/test_minion.py
-${PYSITELIB}/salt/daemons/test/test_minion.pyc
-${PYSITELIB}/salt/daemons/test/test_minion.pyo
-${PYSITELIB}/salt/daemons/test/test_multimaster.py
-${PYSITELIB}/salt/daemons/test/test_multimaster.pyc
-${PYSITELIB}/salt/daemons/test/test_multimaster.pyo
-${PYSITELIB}/salt/daemons/test/test_plans.py
-${PYSITELIB}/salt/daemons/test/test_plans.pyc
-${PYSITELIB}/salt/daemons/test/test_plans.pyo
-${PYSITELIB}/salt/daemons/test/test_presence.py
-${PYSITELIB}/salt/daemons/test/test_presence.pyc
-${PYSITELIB}/salt/daemons/test/test_presence.pyo
-${PYSITELIB}/salt/daemons/test/test_raetkey.py
-${PYSITELIB}/salt/daemons/test/test_raetkey.pyc
-${PYSITELIB}/salt/daemons/test/test_raetkey.pyo
-${PYSITELIB}/salt/daemons/test/test_saltkeep.py
-${PYSITELIB}/salt/daemons/test/test_saltkeep.pyc
-${PYSITELIB}/salt/daemons/test/test_saltkeep.pyo
-${PYSITELIB}/salt/daemons/test/test_stats.py
-${PYSITELIB}/salt/daemons/test/test_stats.pyc
-${PYSITELIB}/salt/daemons/test/test_stats.pyo
 ${PYSITELIB}/salt/defaults/__init__.py
 ${PYSITELIB}/salt/defaults/__init__.pyc
 ${PYSITELIB}/salt/defaults/__init__.pyo
+${PYSITELIB}/salt/defaults/events.py
+${PYSITELIB}/salt/defaults/events.pyc
+${PYSITELIB}/salt/defaults/events.pyo
 ${PYSITELIB}/salt/defaults/exitcodes.py
 ${PYSITELIB}/salt/defaults/exitcodes.pyc
 ${PYSITELIB}/salt/defaults/exitcodes.pyo
@@ -518,9 +486,9 @@ ${PYSITELIB}/salt/engines/__init__.pyo
 ${PYSITELIB}/salt/engines/docker_events.py
 ${PYSITELIB}/salt/engines/docker_events.pyc
 ${PYSITELIB}/salt/engines/docker_events.pyo
-${PYSITELIB}/salt/engines/hipchat.py
-${PYSITELIB}/salt/engines/hipchat.pyc
-${PYSITELIB}/salt/engines/hipchat.pyo
+${PYSITELIB}/salt/engines/fluent.py
+${PYSITELIB}/salt/engines/fluent.pyc
+${PYSITELIB}/salt/engines/fluent.pyo
 ${PYSITELIB}/salt/engines/http_logstash.py
 ${PYSITELIB}/salt/engines/http_logstash.pyc
 ${PYSITELIB}/salt/engines/http_logstash.pyo
@@ -548,6 +516,9 @@ ${PYSITELIB}/salt/engines/reactor.pyo
 ${PYSITELIB}/salt/engines/redis_sentinel.py
 ${PYSITELIB}/salt/engines/redis_sentinel.pyc
 ${PYSITELIB}/salt/engines/redis_sentinel.pyo
+${PYSITELIB}/salt/engines/script.py
+${PYSITELIB}/salt/engines/script.pyc
+${PYSITELIB}/salt/engines/script.pyo
 ${PYSITELIB}/salt/engines/slack.py
 ${PYSITELIB}/salt/engines/slack.pyc
 ${PYSITELIB}/salt/engines/slack.pyo
@@ -584,21 +555,276 @@ ${PYSITELIB}/salt/executors/splay.pyo
 ${PYSITELIB}/salt/executors/sudo.py
 ${PYSITELIB}/salt/executors/sudo.pyc
 ${PYSITELIB}/salt/executors/sudo.pyo
+${PYSITELIB}/salt/executors/transactional_update.py
+${PYSITELIB}/salt/executors/transactional_update.pyc
+${PYSITELIB}/salt/executors/transactional_update.pyo
 ${PYSITELIB}/salt/ext/__init__.py
 ${PYSITELIB}/salt/ext/__init__.pyc
 ${PYSITELIB}/salt/ext/__init__.pyo
 ${PYSITELIB}/salt/ext/backports_abc.py
 ${PYSITELIB}/salt/ext/backports_abc.pyc
 ${PYSITELIB}/salt/ext/backports_abc.pyo
+${PYSITELIB}/salt/ext/importlib_metadata/__init__.py
+${PYSITELIB}/salt/ext/importlib_metadata/__init__.pyc
+${PYSITELIB}/salt/ext/importlib_metadata/__init__.pyo
+${PYSITELIB}/salt/ext/importlib_metadata/_compat.py
+${PYSITELIB}/salt/ext/importlib_metadata/_compat.pyc
+${PYSITELIB}/salt/ext/importlib_metadata/_compat.pyo
 ${PYSITELIB}/salt/ext/ipaddress.py
 ${PYSITELIB}/salt/ext/ipaddress.pyc
 ${PYSITELIB}/salt/ext/ipaddress.pyo
-${PYSITELIB}/salt/ext/six.py
-${PYSITELIB}/salt/ext/six.pyc
-${PYSITELIB}/salt/ext/six.pyo
+${PYSITELIB}/salt/ext/saslprep.py
+${PYSITELIB}/salt/ext/saslprep.pyc
+${PYSITELIB}/salt/ext/saslprep.pyo
 ${PYSITELIB}/salt/ext/ssl_match_hostname.py
 ${PYSITELIB}/salt/ext/ssl_match_hostname.pyc
 ${PYSITELIB}/salt/ext/ssl_match_hostname.pyo
+${PYSITELIB}/salt/ext/tornado/__init__.py
+${PYSITELIB}/salt/ext/tornado/__init__.pyc
+${PYSITELIB}/salt/ext/tornado/__init__.pyo
+${PYSITELIB}/salt/ext/tornado/_locale_data.py
+${PYSITELIB}/salt/ext/tornado/_locale_data.pyc
+${PYSITELIB}/salt/ext/tornado/_locale_data.pyo
+${PYSITELIB}/salt/ext/tornado/auth.py
+${PYSITELIB}/salt/ext/tornado/auth.pyc
+${PYSITELIB}/salt/ext/tornado/auth.pyo
+${PYSITELIB}/salt/ext/tornado/autoreload.py
+${PYSITELIB}/salt/ext/tornado/autoreload.pyc
+${PYSITELIB}/salt/ext/tornado/autoreload.pyo
+${PYSITELIB}/salt/ext/tornado/concurrent.py
+${PYSITELIB}/salt/ext/tornado/concurrent.pyc
+${PYSITELIB}/salt/ext/tornado/concurrent.pyo
+${PYSITELIB}/salt/ext/tornado/curl_httpclient.py
+${PYSITELIB}/salt/ext/tornado/curl_httpclient.pyc
+${PYSITELIB}/salt/ext/tornado/curl_httpclient.pyo
+${PYSITELIB}/salt/ext/tornado/escape.py
+${PYSITELIB}/salt/ext/tornado/escape.pyc
+${PYSITELIB}/salt/ext/tornado/escape.pyo
+${PYSITELIB}/salt/ext/tornado/gen.py
+${PYSITELIB}/salt/ext/tornado/gen.pyc
+${PYSITELIB}/salt/ext/tornado/gen.pyo
+${PYSITELIB}/salt/ext/tornado/http1connection.py
+${PYSITELIB}/salt/ext/tornado/http1connection.pyc
+${PYSITELIB}/salt/ext/tornado/http1connection.pyo
+${PYSITELIB}/salt/ext/tornado/httpclient.py
+${PYSITELIB}/salt/ext/tornado/httpclient.pyc
+${PYSITELIB}/salt/ext/tornado/httpclient.pyo
+${PYSITELIB}/salt/ext/tornado/httpserver.py
+${PYSITELIB}/salt/ext/tornado/httpserver.pyc
+${PYSITELIB}/salt/ext/tornado/httpserver.pyo
+${PYSITELIB}/salt/ext/tornado/httputil.py
+${PYSITELIB}/salt/ext/tornado/httputil.pyc
+${PYSITELIB}/salt/ext/tornado/httputil.pyo
+${PYSITELIB}/salt/ext/tornado/ioloop.py
+${PYSITELIB}/salt/ext/tornado/ioloop.pyc
+${PYSITELIB}/salt/ext/tornado/ioloop.pyo
+${PYSITELIB}/salt/ext/tornado/iostream.py
+${PYSITELIB}/salt/ext/tornado/iostream.pyc
+${PYSITELIB}/salt/ext/tornado/iostream.pyo
+${PYSITELIB}/salt/ext/tornado/locale.py
+${PYSITELIB}/salt/ext/tornado/locale.pyc
+${PYSITELIB}/salt/ext/tornado/locale.pyo
+${PYSITELIB}/salt/ext/tornado/locks.py
+${PYSITELIB}/salt/ext/tornado/locks.pyc
+${PYSITELIB}/salt/ext/tornado/locks.pyo
+${PYSITELIB}/salt/ext/tornado/log.py
+${PYSITELIB}/salt/ext/tornado/log.pyc
+${PYSITELIB}/salt/ext/tornado/log.pyo
+${PYSITELIB}/salt/ext/tornado/netutil.py
+${PYSITELIB}/salt/ext/tornado/netutil.pyc
+${PYSITELIB}/salt/ext/tornado/netutil.pyo
+${PYSITELIB}/salt/ext/tornado/options.py
+${PYSITELIB}/salt/ext/tornado/options.pyc
+${PYSITELIB}/salt/ext/tornado/options.pyo
+${PYSITELIB}/salt/ext/tornado/platform/__init__.py
+${PYSITELIB}/salt/ext/tornado/platform/__init__.pyc
+${PYSITELIB}/salt/ext/tornado/platform/__init__.pyo
+${PYSITELIB}/salt/ext/tornado/platform/asyncio.py
+${PYSITELIB}/salt/ext/tornado/platform/asyncio.pyc
+${PYSITELIB}/salt/ext/tornado/platform/asyncio.pyo
+${PYSITELIB}/salt/ext/tornado/platform/auto.py
+${PYSITELIB}/salt/ext/tornado/platform/auto.pyc
+${PYSITELIB}/salt/ext/tornado/platform/auto.pyo
+${PYSITELIB}/salt/ext/tornado/platform/caresresolver.py
+${PYSITELIB}/salt/ext/tornado/platform/caresresolver.pyc
+${PYSITELIB}/salt/ext/tornado/platform/caresresolver.pyo
+${PYSITELIB}/salt/ext/tornado/platform/common.py
+${PYSITELIB}/salt/ext/tornado/platform/common.pyc
+${PYSITELIB}/salt/ext/tornado/platform/common.pyo
+${PYSITELIB}/salt/ext/tornado/platform/epoll.py
+${PYSITELIB}/salt/ext/tornado/platform/epoll.pyc
+${PYSITELIB}/salt/ext/tornado/platform/epoll.pyo
+${PYSITELIB}/salt/ext/tornado/platform/interface.py
+${PYSITELIB}/salt/ext/tornado/platform/interface.pyc
+${PYSITELIB}/salt/ext/tornado/platform/interface.pyo
+${PYSITELIB}/salt/ext/tornado/platform/kqueue.py
+${PYSITELIB}/salt/ext/tornado/platform/kqueue.pyc
+${PYSITELIB}/salt/ext/tornado/platform/kqueue.pyo
+${PYSITELIB}/salt/ext/tornado/platform/posix.py
+${PYSITELIB}/salt/ext/tornado/platform/posix.pyc
+${PYSITELIB}/salt/ext/tornado/platform/posix.pyo
+${PYSITELIB}/salt/ext/tornado/platform/select.py
+${PYSITELIB}/salt/ext/tornado/platform/select.pyc
+${PYSITELIB}/salt/ext/tornado/platform/select.pyo
+${PYSITELIB}/salt/ext/tornado/platform/twisted.py
+${PYSITELIB}/salt/ext/tornado/platform/twisted.pyc
+${PYSITELIB}/salt/ext/tornado/platform/twisted.pyo
+${PYSITELIB}/salt/ext/tornado/platform/windows.py
+${PYSITELIB}/salt/ext/tornado/platform/windows.pyc
+${PYSITELIB}/salt/ext/tornado/platform/windows.pyo
+${PYSITELIB}/salt/ext/tornado/process.py
+${PYSITELIB}/salt/ext/tornado/process.pyc
+${PYSITELIB}/salt/ext/tornado/process.pyo
+${PYSITELIB}/salt/ext/tornado/queues.py
+${PYSITELIB}/salt/ext/tornado/queues.pyc
+${PYSITELIB}/salt/ext/tornado/queues.pyo
+${PYSITELIB}/salt/ext/tornado/routing.py
+${PYSITELIB}/salt/ext/tornado/routing.pyc
+${PYSITELIB}/salt/ext/tornado/routing.pyo
+${PYSITELIB}/salt/ext/tornado/simple_httpclient.py
+${PYSITELIB}/salt/ext/tornado/simple_httpclient.pyc
+${PYSITELIB}/salt/ext/tornado/simple_httpclient.pyo
+${PYSITELIB}/salt/ext/tornado/stack_context.py
+${PYSITELIB}/salt/ext/tornado/stack_context.pyc
+${PYSITELIB}/salt/ext/tornado/stack_context.pyo
+${PYSITELIB}/salt/ext/tornado/tcpclient.py
+${PYSITELIB}/salt/ext/tornado/tcpclient.pyc
+${PYSITELIB}/salt/ext/tornado/tcpclient.pyo
+${PYSITELIB}/salt/ext/tornado/tcpserver.py
+${PYSITELIB}/salt/ext/tornado/tcpserver.pyc
+${PYSITELIB}/salt/ext/tornado/tcpserver.pyo
+${PYSITELIB}/salt/ext/tornado/template.py
+${PYSITELIB}/salt/ext/tornado/template.pyc
+${PYSITELIB}/salt/ext/tornado/template.pyo
+${PYSITELIB}/salt/ext/tornado/test/__init__.py
+${PYSITELIB}/salt/ext/tornado/test/__init__.pyc
+${PYSITELIB}/salt/ext/tornado/test/__init__.pyo
+${PYSITELIB}/salt/ext/tornado/test/__main__.py
+${PYSITELIB}/salt/ext/tornado/test/__main__.pyc
+${PYSITELIB}/salt/ext/tornado/test/__main__.pyo
+${PYSITELIB}/salt/ext/tornado/test/asyncio_test.py
+${PYSITELIB}/salt/ext/tornado/test/asyncio_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/asyncio_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/auth_test.py
+${PYSITELIB}/salt/ext/tornado/test/auth_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/auth_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/concurrent_test.py
+${PYSITELIB}/salt/ext/tornado/test/concurrent_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/concurrent_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/curl_httpclient_test.py
+${PYSITELIB}/salt/ext/tornado/test/curl_httpclient_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/curl_httpclient_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/escape_test.py
+${PYSITELIB}/salt/ext/tornado/test/escape_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/escape_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/gen_test.py
+${PYSITELIB}/salt/ext/tornado/test/gen_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/gen_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/http1connection_test.py
+${PYSITELIB}/salt/ext/tornado/test/http1connection_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/http1connection_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/httpclient_test.py
+${PYSITELIB}/salt/ext/tornado/test/httpclient_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/httpclient_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/httpserver_test.py
+${PYSITELIB}/salt/ext/tornado/test/httpserver_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/httpserver_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/httputil_test.py
+${PYSITELIB}/salt/ext/tornado/test/httputil_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/httputil_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/import_test.py
+${PYSITELIB}/salt/ext/tornado/test/import_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/import_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/ioloop_test.py
+${PYSITELIB}/salt/ext/tornado/test/ioloop_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/ioloop_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/iostream_test.py
+${PYSITELIB}/salt/ext/tornado/test/iostream_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/iostream_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/locale_test.py
+${PYSITELIB}/salt/ext/tornado/test/locale_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/locale_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/locks_test.py
+${PYSITELIB}/salt/ext/tornado/test/locks_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/locks_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/log_test.py
+${PYSITELIB}/salt/ext/tornado/test/log_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/log_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/netutil_test.py
+${PYSITELIB}/salt/ext/tornado/test/netutil_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/netutil_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/options_test.py
+${PYSITELIB}/salt/ext/tornado/test/options_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/options_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/process_test.py
+${PYSITELIB}/salt/ext/tornado/test/process_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/process_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/queues_test.py
+${PYSITELIB}/salt/ext/tornado/test/queues_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/queues_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/resolve_test_helper.py
+${PYSITELIB}/salt/ext/tornado/test/resolve_test_helper.pyc
+${PYSITELIB}/salt/ext/tornado/test/resolve_test_helper.pyo
+${PYSITELIB}/salt/ext/tornado/test/routing_test.py
+${PYSITELIB}/salt/ext/tornado/test/routing_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/routing_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/runtests.py
+${PYSITELIB}/salt/ext/tornado/test/runtests.pyc
+${PYSITELIB}/salt/ext/tornado/test/runtests.pyo
+${PYSITELIB}/salt/ext/tornado/test/simple_httpclient_test.py
+${PYSITELIB}/salt/ext/tornado/test/simple_httpclient_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/simple_httpclient_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/stack_context_test.py
+${PYSITELIB}/salt/ext/tornado/test/stack_context_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/stack_context_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/tcpclient_test.py
+${PYSITELIB}/salt/ext/tornado/test/tcpclient_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/tcpclient_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/tcpserver_test.py
+${PYSITELIB}/salt/ext/tornado/test/tcpserver_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/tcpserver_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/template_test.py
+${PYSITELIB}/salt/ext/tornado/test/template_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/template_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/testing_test.py
+${PYSITELIB}/salt/ext/tornado/test/testing_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/testing_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/twisted_test.py
+${PYSITELIB}/salt/ext/tornado/test/twisted_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/twisted_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/util.py
+${PYSITELIB}/salt/ext/tornado/test/util.pyc
+${PYSITELIB}/salt/ext/tornado/test/util.pyo
+${PYSITELIB}/salt/ext/tornado/test/util_test.py
+${PYSITELIB}/salt/ext/tornado/test/util_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/util_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/web_test.py
+${PYSITELIB}/salt/ext/tornado/test/web_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/web_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/websocket_test.py
+${PYSITELIB}/salt/ext/tornado/test/websocket_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/websocket_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/windows_test.py
+${PYSITELIB}/salt/ext/tornado/test/windows_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/windows_test.pyo
+${PYSITELIB}/salt/ext/tornado/test/wsgi_test.py
+${PYSITELIB}/salt/ext/tornado/test/wsgi_test.pyc
+${PYSITELIB}/salt/ext/tornado/test/wsgi_test.pyo
+${PYSITELIB}/salt/ext/tornado/testing.py
+${PYSITELIB}/salt/ext/tornado/testing.pyc
+${PYSITELIB}/salt/ext/tornado/testing.pyo
+${PYSITELIB}/salt/ext/tornado/util.py
+${PYSITELIB}/salt/ext/tornado/util.pyc
+${PYSITELIB}/salt/ext/tornado/util.pyo
+${PYSITELIB}/salt/ext/tornado/web.py
+${PYSITELIB}/salt/ext/tornado/web.pyc
+${PYSITELIB}/salt/ext/tornado/web.pyo
+${PYSITELIB}/salt/ext/tornado/websocket.py
+${PYSITELIB}/salt/ext/tornado/websocket.pyc
+${PYSITELIB}/salt/ext/tornado/websocket.pyo
+${PYSITELIB}/salt/ext/tornado/wsgi.py
+${PYSITELIB}/salt/ext/tornado/wsgi.pyc
+${PYSITELIB}/salt/ext/tornado/wsgi.pyo
 ${PYSITELIB}/salt/ext/vsan/__init__.py
 ${PYSITELIB}/salt/ext/vsan/__init__.pyc
 ${PYSITELIB}/salt/ext/vsan/__init__.pyo
@@ -611,6 +837,12 @@ ${PYSITELIB}/salt/ext/vsan/vsanmgmtObjec
 ${PYSITELIB}/salt/ext/win_inet_pton.py
 ${PYSITELIB}/salt/ext/win_inet_pton.pyc
 ${PYSITELIB}/salt/ext/win_inet_pton.pyo
+${PYSITELIB}/salt/ext/zipp.py
+${PYSITELIB}/salt/ext/zipp.pyc
+${PYSITELIB}/salt/ext/zipp.pyo
+${PYSITELIB}/salt/features.py
+${PYSITELIB}/salt/features.pyc
+${PYSITELIB}/salt/features.pyo
 ${PYSITELIB}/salt/fileclient.py
 ${PYSITELIB}/salt/fileclient.pyc
 ${PYSITELIB}/salt/fileclient.pyo
@@ -671,6 +903,9 @@ ${PYSITELIB}/salt/grains/iscsi.pyo
 ${PYSITELIB}/salt/grains/junos.py
 ${PYSITELIB}/salt/grains/junos.pyc
 ${PYSITELIB}/salt/grains/junos.pyo
+${PYSITELIB}/salt/grains/lvm.py
+${PYSITELIB}/salt/grains/lvm.pyc
+${PYSITELIB}/salt/grains/lvm.pyo
 ${PYSITELIB}/salt/grains/marathon.py
 ${PYSITELIB}/salt/grains/marathon.pyc
 ${PYSITELIB}/salt/grains/marathon.pyo
@@ -689,6 +924,9 @@ ${PYSITELIB}/salt/grains/minion_process.
 ${PYSITELIB}/salt/grains/napalm.py
 ${PYSITELIB}/salt/grains/napalm.pyc
 ${PYSITELIB}/salt/grains/napalm.pyo
+${PYSITELIB}/salt/grains/nvme.py
+${PYSITELIB}/salt/grains/nvme.pyc
+${PYSITELIB}/salt/grains/nvme.pyo
 ${PYSITELIB}/salt/grains/nxos.py
 ${PYSITELIB}/salt/grains/nxos.pyc
 ${PYSITELIB}/salt/grains/nxos.pyo
@@ -698,6 +936,9 @@ ${PYSITELIB}/salt/grains/opts.pyo
 ${PYSITELIB}/salt/grains/panos.py
 ${PYSITELIB}/salt/grains/panos.pyc
 ${PYSITELIB}/salt/grains/panos.pyo
+${PYSITELIB}/salt/grains/pending_reboot.py
+${PYSITELIB}/salt/grains/pending_reboot.pyc
+${PYSITELIB}/salt/grains/pending_reboot.pyo
 ${PYSITELIB}/salt/grains/philips_hue.py
 ${PYSITELIB}/salt/grains/philips_hue.pyc
 ${PYSITELIB}/salt/grains/philips_hue.pyo
@@ -716,9 +957,15 @@ ${PYSITELIB}/salt/grains/zfs.pyo
 ${PYSITELIB}/salt/key.py
 ${PYSITELIB}/salt/key.pyc
 ${PYSITELIB}/salt/key.pyo
-${PYSITELIB}/salt/loader.py
-${PYSITELIB}/salt/loader.pyc
-${PYSITELIB}/salt/loader.pyo
+${PYSITELIB}/salt/loader/__init__.py
+${PYSITELIB}/salt/loader/__init__.pyc
+${PYSITELIB}/salt/loader/__init__.pyo
+${PYSITELIB}/salt/loader/context.py
+${PYSITELIB}/salt/loader/context.pyc
+${PYSITELIB}/salt/loader/context.pyo
+${PYSITELIB}/salt/loader/lazy.py
+${PYSITELIB}/salt/loader/lazy.pyc
+${PYSITELIB}/salt/loader/lazy.pyo
 ${PYSITELIB}/salt/log/__init__.py
 ${PYSITELIB}/salt/log/__init__.pyc
 ${PYSITELIB}/salt/log/__init__.pyo
@@ -800,6 +1047,9 @@ ${PYSITELIB}/salt/matchers/range_match.p
 ${PYSITELIB}/salt/metaproxy/__init__.py
 ${PYSITELIB}/salt/metaproxy/__init__.pyc
 ${PYSITELIB}/salt/metaproxy/__init__.pyo
+${PYSITELIB}/salt/metaproxy/deltaproxy.py
+${PYSITELIB}/salt/metaproxy/deltaproxy.pyc
+${PYSITELIB}/salt/metaproxy/deltaproxy.pyo
 ${PYSITELIB}/salt/metaproxy/proxy.py
 ${PYSITELIB}/salt/metaproxy/proxy.pyc
 ${PYSITELIB}/salt/metaproxy/proxy.pyo
@@ -872,6 +1122,9 @@ ${PYSITELIB}/salt/modules/aws_sqs.pyo
 ${PYSITELIB}/salt/modules/azurearm_compute.py
 ${PYSITELIB}/salt/modules/azurearm_compute.pyc
 ${PYSITELIB}/salt/modules/azurearm_compute.pyo
+${PYSITELIB}/salt/modules/azurearm_dns.py
+${PYSITELIB}/salt/modules/azurearm_dns.pyc
+${PYSITELIB}/salt/modules/azurearm_dns.pyo
 ${PYSITELIB}/salt/modules/azurearm_network.py
 ${PYSITELIB}/salt/modules/azurearm_network.pyc
 ${PYSITELIB}/salt/modules/azurearm_network.pyo
@@ -881,6 +1134,9 @@ ${PYSITELIB}/salt/modules/azurearm_resou
 ${PYSITELIB}/salt/modules/bamboohr.py
 ${PYSITELIB}/salt/modules/bamboohr.pyc
 ${PYSITELIB}/salt/modules/bamboohr.pyo
+${PYSITELIB}/salt/modules/baredoc.py
+${PYSITELIB}/salt/modules/baredoc.pyc
+${PYSITELIB}/salt/modules/baredoc.pyo
 ${PYSITELIB}/salt/modules/bcache.py
 ${PYSITELIB}/salt/modules/bcache.pyc
 ${PYSITELIB}/salt/modules/bcache.pyo
@@ -896,6 +1152,9 @@ ${PYSITELIB}/salt/modules/bluez_bluetoot
 ${PYSITELIB}/salt/modules/boto3_elasticache.py
 ${PYSITELIB}/salt/modules/boto3_elasticache.pyc
 ${PYSITELIB}/salt/modules/boto3_elasticache.pyo
+${PYSITELIB}/salt/modules/boto3_elasticsearch.py
+${PYSITELIB}/salt/modules/boto3_elasticsearch.pyc
+${PYSITELIB}/salt/modules/boto3_elasticsearch.pyo
 ${PYSITELIB}/salt/modules/boto3_route53.py
 ${PYSITELIB}/salt/modules/boto3_route53.pyc
 ${PYSITELIB}/salt/modules/boto3_route53.pyo
@@ -986,6 +1245,9 @@ ${PYSITELIB}/salt/modules/boto_sns.pyo
 ${PYSITELIB}/salt/modules/boto_sqs.py
 ${PYSITELIB}/salt/modules/boto_sqs.pyc
 ${PYSITELIB}/salt/modules/boto_sqs.pyo
+${PYSITELIB}/salt/modules/boto_ssm.py
+${PYSITELIB}/salt/modules/boto_ssm.pyc
+${PYSITELIB}/salt/modules/boto_ssm.pyo
 ${PYSITELIB}/salt/modules/boto_vpc.py
 ${PYSITELIB}/salt/modules/boto_vpc.pyc
 ${PYSITELIB}/salt/modules/boto_vpc.pyo
@@ -1007,12 +1269,12 @@ ${PYSITELIB}/salt/modules/cabal.pyo
 ${PYSITELIB}/salt/modules/capirca_acl.py
 ${PYSITELIB}/salt/modules/capirca_acl.pyc
 ${PYSITELIB}/salt/modules/capirca_acl.pyo
-${PYSITELIB}/salt/modules/cassandra.py
-${PYSITELIB}/salt/modules/cassandra.pyc
-${PYSITELIB}/salt/modules/cassandra.pyo
 ${PYSITELIB}/salt/modules/cassandra_cql.py
 ${PYSITELIB}/salt/modules/cassandra_cql.pyc
 ${PYSITELIB}/salt/modules/cassandra_cql.pyo
+${PYSITELIB}/salt/modules/cassandra_mod.py
+${PYSITELIB}/salt/modules/cassandra_mod.pyc
+${PYSITELIB}/salt/modules/cassandra_mod.pyo
 ${PYSITELIB}/salt/modules/celery.py
 ${PYSITELIB}/salt/modules/celery.pyc
 ${PYSITELIB}/salt/modules/celery.pyo
@@ -1031,6 +1293,9 @@ ${PYSITELIB}/salt/modules/chocolatey.pyo
 ${PYSITELIB}/salt/modules/chronos.py
 ${PYSITELIB}/salt/modules/chronos.pyc
 ${PYSITELIB}/salt/modules/chronos.pyo
+${PYSITELIB}/salt/modules/chroot.py
+${PYSITELIB}/salt/modules/chroot.pyc
+${PYSITELIB}/salt/modules/chroot.pyo
 ${PYSITELIB}/salt/modules/cimc.py
 ${PYSITELIB}/salt/modules/cimc.pyc
 ${PYSITELIB}/salt/modules/cimc.pyo
@@ -1109,6 +1374,9 @@ ${PYSITELIB}/salt/modules/debuild_pkgbui
 ${PYSITELIB}/salt/modules/defaults.py
 ${PYSITELIB}/salt/modules/defaults.pyc
 ${PYSITELIB}/salt/modules/defaults.pyo
+${PYSITELIB}/salt/modules/devinfo.py
+${PYSITELIB}/salt/modules/devinfo.pyc
+${PYSITELIB}/salt/modules/devinfo.pyo
 ${PYSITELIB}/salt/modules/devmap.py
 ${PYSITELIB}/salt/modules/devmap.pyc
 ${PYSITELIB}/salt/modules/devmap.pyo
@@ -1217,6 +1485,9 @@ ${PYSITELIB}/salt/modules/freebsdports.p
 ${PYSITELIB}/salt/modules/freebsdservice.py
 ${PYSITELIB}/salt/modules/freebsdservice.pyc
 ${PYSITELIB}/salt/modules/freebsdservice.pyo
+${PYSITELIB}/salt/modules/freezer.py
+${PYSITELIB}/salt/modules/freezer.pyc
+${PYSITELIB}/salt/modules/freezer.pyo
 ${PYSITELIB}/salt/modules/gcp_addon.py
 ${PYSITELIB}/salt/modules/gcp_addon.pyc
 ${PYSITELIB}/salt/modules/gcp_addon.pyo
@@ -1238,9 +1509,6 @@ ${PYSITELIB}/salt/modules/git.pyo
 ${PYSITELIB}/salt/modules/github.py
 ${PYSITELIB}/salt/modules/github.pyc
 ${PYSITELIB}/salt/modules/github.pyo
-${PYSITELIB}/salt/modules/glance.py
-${PYSITELIB}/salt/modules/glance.pyc
-${PYSITELIB}/salt/modules/glance.pyo
 ${PYSITELIB}/salt/modules/glanceng.py
 ${PYSITELIB}/salt/modules/glanceng.pyc
 ${PYSITELIB}/salt/modules/glanceng.pyo
@@ -1286,15 +1554,15 @@ ${PYSITELIB}/salt/modules/hashutil.pyo
 ${PYSITELIB}/salt/modules/heat.py
 ${PYSITELIB}/salt/modules/heat.pyc
 ${PYSITELIB}/salt/modules/heat.pyo
+${PYSITELIB}/salt/modules/helm.py
+${PYSITELIB}/salt/modules/helm.pyc
+${PYSITELIB}/salt/modules/helm.pyo
 ${PYSITELIB}/salt/modules/hg.py
 ${PYSITELIB}/salt/modules/hg.pyc
 ${PYSITELIB}/salt/modules/hg.pyo
 ${PYSITELIB}/salt/modules/highstate_doc.py
 ${PYSITELIB}/salt/modules/highstate_doc.pyc
 ${PYSITELIB}/salt/modules/highstate_doc.pyo
-${PYSITELIB}/salt/modules/hipchat.py
-${PYSITELIB}/salt/modules/hipchat.pyc
-${PYSITELIB}/salt/modules/hipchat.pyo
 ${PYSITELIB}/salt/modules/hosts.py
 ${PYSITELIB}/salt/modules/hosts.pyc
 ${PYSITELIB}/salt/modules/hosts.pyo
@@ -1304,6 +1572,9 @@ ${PYSITELIB}/salt/modules/http.pyo
 ${PYSITELIB}/salt/modules/icinga2.py
 ${PYSITELIB}/salt/modules/icinga2.pyc
 ${PYSITELIB}/salt/modules/icinga2.pyo
+${PYSITELIB}/salt/modules/idem.py
+${PYSITELIB}/salt/modules/idem.pyc
+${PYSITELIB}/salt/modules/idem.pyo
 ${PYSITELIB}/salt/modules/ifttt.py
 ${PYSITELIB}/salt/modules/ifttt.pyc
 ${PYSITELIB}/salt/modules/ifttt.pyo
@@ -1379,6 +1650,9 @@ ${PYSITELIB}/salt/modules/jboss7_cli.pyo
 ${PYSITELIB}/salt/modules/jenkinsmod.py
 ${PYSITELIB}/salt/modules/jenkinsmod.pyc
 ${PYSITELIB}/salt/modules/jenkinsmod.pyo
+${PYSITELIB}/salt/modules/jinja.py
+${PYSITELIB}/salt/modules/jinja.pyc
+${PYSITELIB}/salt/modules/jinja.pyo
 ${PYSITELIB}/salt/modules/jira_mod.py
 ${PYSITELIB}/salt/modules/jira_mod.pyc
 ${PYSITELIB}/salt/modules/jira_mod.pyo
@@ -1412,9 +1686,15 @@ ${PYSITELIB}/salt/modules/keystone.pyo
 ${PYSITELIB}/salt/modules/keystoneng.py
 ${PYSITELIB}/salt/modules/keystoneng.pyc
 ${PYSITELIB}/salt/modules/keystoneng.pyo
+${PYSITELIB}/salt/modules/keystore.py
+${PYSITELIB}/salt/modules/keystore.pyc
+${PYSITELIB}/salt/modules/keystore.pyo
 ${PYSITELIB}/salt/modules/kmod.py
 ${PYSITELIB}/salt/modules/kmod.pyc
 ${PYSITELIB}/salt/modules/kmod.pyo
+${PYSITELIB}/salt/modules/kubeadm.py
+${PYSITELIB}/salt/modules/kubeadm.pyc
+${PYSITELIB}/salt/modules/kubeadm.pyo
 ${PYSITELIB}/salt/modules/kubernetesmod.py
 ${PYSITELIB}/salt/modules/kubernetesmod.pyc
 ${PYSITELIB}/salt/modules/kubernetesmod.pyo
@@ -1451,6 +1731,12 @@ ${PYSITELIB}/salt/modules/linux_ip.pyo
 ${PYSITELIB}/salt/modules/linux_lvm.py
 ${PYSITELIB}/salt/modules/linux_lvm.pyc
 ${PYSITELIB}/salt/modules/linux_lvm.pyo
+${PYSITELIB}/salt/modules/linux_service.py
+${PYSITELIB}/salt/modules/linux_service.pyc
+${PYSITELIB}/salt/modules/linux_service.pyo
+${PYSITELIB}/salt/modules/linux_shadow.py
+${PYSITELIB}/salt/modules/linux_shadow.pyc
+${PYSITELIB}/salt/modules/linux_shadow.pyo
 ${PYSITELIB}/salt/modules/linux_sysctl.py
 ${PYSITELIB}/salt/modules/linux_sysctl.pyc
 ${PYSITELIB}/salt/modules/linux_sysctl.pyo
@@ -1709,6 +1995,9 @@ ${PYSITELIB}/salt/modules/nxos.pyo
 ${PYSITELIB}/salt/modules/nxos_api.py
 ${PYSITELIB}/salt/modules/nxos_api.pyc
 ${PYSITELIB}/salt/modules/nxos_api.pyo
+${PYSITELIB}/salt/modules/nxos_upgrade.py
+${PYSITELIB}/salt/modules/nxos_upgrade.pyc
+${PYSITELIB}/salt/modules/nxos_upgrade.pyo
 ${PYSITELIB}/salt/modules/omapi.py
 ${PYSITELIB}/salt/modules/omapi.pyc
 ${PYSITELIB}/salt/modules/omapi.pyo
@@ -1868,9 +2157,6 @@ ${PYSITELIB}/salt/modules/quota.pyo
 ${PYSITELIB}/salt/modules/rabbitmq.py
 ${PYSITELIB}/salt/modules/rabbitmq.pyc
 ${PYSITELIB}/salt/modules/rabbitmq.pyo
-${PYSITELIB}/salt/modules/raet_publish.py
-${PYSITELIB}/salt/modules/raet_publish.pyc
-${PYSITELIB}/salt/modules/raet_publish.pyo
 ${PYSITELIB}/salt/modules/rallydev.py
 ${PYSITELIB}/salt/modules/rallydev.pyc
 ${PYSITELIB}/salt/modules/rallydev.pyo
@@ -1886,6 +2172,9 @@ ${PYSITELIB}/salt/modules/rbenv.pyo
 ${PYSITELIB}/salt/modules/rdp.py
 ${PYSITELIB}/salt/modules/rdp.pyc
 ${PYSITELIB}/salt/modules/rdp.pyo
+${PYSITELIB}/salt/modules/rebootmgr.py
+${PYSITELIB}/salt/modules/rebootmgr.pyc
+${PYSITELIB}/salt/modules/rebootmgr.pyo
 ${PYSITELIB}/salt/modules/redismod.py
 ${PYSITELIB}/salt/modules/redismod.pyc
 ${PYSITELIB}/salt/modules/redismod.pyo
@@ -1940,6 +2229,9 @@ ${PYSITELIB}/salt/modules/s6.pyo
 ${PYSITELIB}/salt/modules/salt_proxy.py
 ${PYSITELIB}/salt/modules/salt_proxy.pyc
 ${PYSITELIB}/salt/modules/salt_proxy.pyo
+${PYSITELIB}/salt/modules/salt_version.py
+${PYSITELIB}/salt/modules/salt_version.pyc
+${PYSITELIB}/salt/modules/salt_version.pyo
 ${PYSITELIB}/salt/modules/saltcheck.py
 ${PYSITELIB}/salt/modules/saltcheck.pyc
 ${PYSITELIB}/salt/modules/saltcheck.pyo
@@ -1976,18 +2268,15 @@ ${PYSITELIB}/salt/modules/sensors.pyo
 ${PYSITELIB}/salt/modules/serverdensity_device.py
 ${PYSITELIB}/salt/modules/serverdensity_device.pyc
 ${PYSITELIB}/salt/modules/serverdensity_device.pyo
-${PYSITELIB}/salt/modules/service.py
-${PYSITELIB}/salt/modules/service.pyc
-${PYSITELIB}/salt/modules/service.pyo
 ${PYSITELIB}/salt/modules/servicenow.py
 ${PYSITELIB}/salt/modules/servicenow.pyc
 ${PYSITELIB}/salt/modules/servicenow.pyo
-${PYSITELIB}/salt/modules/shadow.py
-${PYSITELIB}/salt/modules/shadow.pyc
-${PYSITELIB}/salt/modules/shadow.pyo
 ${PYSITELIB}/salt/modules/slack_notify.py
 ${PYSITELIB}/salt/modules/slack_notify.pyc
 ${PYSITELIB}/salt/modules/slack_notify.pyo
+${PYSITELIB}/salt/modules/slackware_service.py
+${PYSITELIB}/salt/modules/slackware_service.pyc
+${PYSITELIB}/salt/modules/slackware_service.pyo
 ${PYSITELIB}/salt/modules/slsutil.py
 ${PYSITELIB}/salt/modules/slsutil.pyc
 ${PYSITELIB}/salt/modules/slsutil.pyo
@@ -2141,6 +2430,9 @@ ${PYSITELIB}/salt/modules/tomcat.pyo
 ${PYSITELIB}/salt/modules/trafficserver.py
 ${PYSITELIB}/salt/modules/trafficserver.pyc
 ${PYSITELIB}/salt/modules/trafficserver.pyo
+${PYSITELIB}/salt/modules/transactional_update.py
+${PYSITELIB}/salt/modules/transactional_update.pyc
+${PYSITELIB}/salt/modules/transactional_update.pyo
 ${PYSITELIB}/salt/modules/travisci.py
 ${PYSITELIB}/salt/modules/travisci.pyc
 ${PYSITELIB}/salt/modules/travisci.pyo
@@ -2321,6 +2613,9 @@ ${PYSITELIB}/salt/modules/xbpspkg.pyo
 ${PYSITELIB}/salt/modules/xfs.py
 ${PYSITELIB}/salt/modules/xfs.pyc
 ${PYSITELIB}/salt/modules/xfs.pyo
+${PYSITELIB}/salt/modules/xml.py
+${PYSITELIB}/salt/modules/xml.pyc
+${PYSITELIB}/salt/modules/xml.pyo
 ${PYSITELIB}/salt/modules/xmpp.py
 ${PYSITELIB}/salt/modules/xmpp.pyc
 ${PYSITELIB}/salt/modules/xmpp.pyo
@@ -2399,6 +2694,9 @@ ${PYSITELIB}/salt/netapi/rest_wsgi.pyo
 ${PYSITELIB}/salt/output/__init__.py
 ${PYSITELIB}/salt/output/__init__.pyc
 ${PYSITELIB}/salt/output/__init__.pyo
+${PYSITELIB}/salt/output/dson.py
+${PYSITELIB}/salt/output/dson.pyc
+${PYSITELIB}/salt/output/dson.pyo
 ${PYSITELIB}/salt/output/highstate.py
 ${PYSITELIB}/salt/output/highstate.pyc
 ${PYSITELIB}/salt/output/highstate.pyo
@@ -2456,6 +2754,9 @@ ${PYSITELIB}/salt/payload.pyo
 ${PYSITELIB}/salt/pillar/__init__.py
 ${PYSITELIB}/salt/pillar/__init__.pyc
 ${PYSITELIB}/salt/pillar/__init__.pyo
+${PYSITELIB}/salt/pillar/azureblob.py
+${PYSITELIB}/salt/pillar/azureblob.pyc
+${PYSITELIB}/salt/pillar/azureblob.pyo
 ${PYSITELIB}/salt/pillar/cmd_json.py
 ${PYSITELIB}/salt/pillar/cmd_json.pyc
 ${PYSITELIB}/salt/pillar/cmd_json.pyo
@@ -2618,6 +2919,9 @@ ${PYSITELIB}/salt/proxy/cimc.pyo
 ${PYSITELIB}/salt/proxy/cisconso.py
 ${PYSITELIB}/salt/proxy/cisconso.pyc
 ${PYSITELIB}/salt/proxy/cisconso.pyo
+${PYSITELIB}/salt/proxy/deltaproxy.py
+${PYSITELIB}/salt/proxy/deltaproxy.pyc
+${PYSITELIB}/salt/proxy/deltaproxy.pyo
 ${PYSITELIB}/salt/proxy/docker.py
 ${PYSITELIB}/salt/proxy/docker.pyc
 ${PYSITELIB}/salt/proxy/docker.pyo
@@ -2735,6 +3039,9 @@ ${PYSITELIB}/salt/renderers/pyobjects.py
 ${PYSITELIB}/salt/renderers/stateconf.py
 ${PYSITELIB}/salt/renderers/stateconf.pyc
 ${PYSITELIB}/salt/renderers/stateconf.pyo
+${PYSITELIB}/salt/renderers/tomlmod.py
+${PYSITELIB}/salt/renderers/tomlmod.pyc
+${PYSITELIB}/salt/renderers/tomlmod.pyo
 ${PYSITELIB}/salt/renderers/wempy.py
 ${PYSITELIB}/salt/renderers/wempy.pyc
 ${PYSITELIB}/salt/renderers/wempy.pyo
@@ -2747,6 +3054,9 @@ ${PYSITELIB}/salt/renderers/yamlex.pyo
 ${PYSITELIB}/salt/returners/__init__.py
 ${PYSITELIB}/salt/returners/__init__.pyc
 ${PYSITELIB}/salt/returners/__init__.pyo
+${PYSITELIB}/salt/returners/appoptics_return.py
+${PYSITELIB}/salt/returners/appoptics_return.pyc
+${PYSITELIB}/salt/returners/appoptics_return.pyo
 ${PYSITELIB}/salt/returners/carbon_return.py
 ${PYSITELIB}/salt/returners/carbon_return.pyc
 ${PYSITELIB}/salt/returners/carbon_return.pyo
@@ -2774,9 +3084,6 @@ ${PYSITELIB}/salt/returners/etcd_return.
 ${PYSITELIB}/salt/returners/highstate_return.py
 ${PYSITELIB}/salt/returners/highstate_return.pyc
 ${PYSITELIB}/salt/returners/highstate_return.pyo
-${PYSITELIB}/salt/returners/hipchat_return.py
-${PYSITELIB}/salt/returners/hipchat_return.pyc
-${PYSITELIB}/salt/returners/hipchat_return.pyo
 ${PYSITELIB}/salt/returners/influxdb_return.py
 ${PYSITELIB}/salt/returners/influxdb_return.pyc
 ${PYSITELIB}/salt/returners/influxdb_return.pyo
@@ -2840,6 +3147,9 @@ ${PYSITELIB}/salt/returners/sentry_retur
 ${PYSITELIB}/salt/returners/slack_returner.py
 ${PYSITELIB}/salt/returners/slack_returner.pyc
 ${PYSITELIB}/salt/returners/slack_returner.pyo
+${PYSITELIB}/salt/returners/slack_webhook_return.py
+${PYSITELIB}/salt/returners/slack_webhook_return.pyc
+${PYSITELIB}/salt/returners/slack_webhook_return.pyo
 ${PYSITELIB}/salt/returners/sms_return.py
 ${PYSITELIB}/salt/returners/sms_return.pyc
 ${PYSITELIB}/salt/returners/sms_return.pyo
@@ -2879,6 +3189,9 @@ ${PYSITELIB}/salt/roster/cloud.pyo
 ${PYSITELIB}/salt/roster/clustershell.py
 ${PYSITELIB}/salt/roster/clustershell.pyc
 ${PYSITELIB}/salt/roster/clustershell.pyo
+${PYSITELIB}/salt/roster/dir.py
+${PYSITELIB}/salt/roster/dir.pyc
+${PYSITELIB}/salt/roster/dir.pyo
 ${PYSITELIB}/salt/roster/flat.py
 ${PYSITELIB}/salt/roster/flat.pyc
 ${PYSITELIB}/salt/roster/flat.pyo
@@ -3095,6 +3408,9 @@ ${PYSITELIB}/salt/serializers/json.pyo
 ${PYSITELIB}/salt/serializers/msgpack.py
 ${PYSITELIB}/salt/serializers/msgpack.pyc
 ${PYSITELIB}/salt/serializers/msgpack.pyo
+${PYSITELIB}/salt/serializers/plist.py
+${PYSITELIB}/salt/serializers/plist.pyc
+${PYSITELIB}/salt/serializers/plist.pyo
 ${PYSITELIB}/salt/serializers/python.py
 ${PYSITELIB}/salt/serializers/python.pyc
 ${PYSITELIB}/salt/serializers/python.pyo
@@ -3173,6 +3489,9 @@ ${PYSITELIB}/salt/states/aws_sqs.pyo
 ${PYSITELIB}/salt/states/azurearm_compute.py
 ${PYSITELIB}/salt/states/azurearm_compute.pyc
 ${PYSITELIB}/salt/states/azurearm_compute.pyo
+${PYSITELIB}/salt/states/azurearm_dns.py
+${PYSITELIB}/salt/states/azurearm_dns.pyc
+${PYSITELIB}/salt/states/azurearm_dns.pyo
 ${PYSITELIB}/salt/states/azurearm_network.py
 ${PYSITELIB}/salt/states/azurearm_network.pyc
 ${PYSITELIB}/salt/states/azurearm_network.pyo
@@ -3191,6 +3510,9 @@ ${PYSITELIB}/salt/states/blockdev.pyo
 ${PYSITELIB}/salt/states/boto3_elasticache.py
 ${PYSITELIB}/salt/states/boto3_elasticache.pyc
 ${PYSITELIB}/salt/states/boto3_elasticache.pyo
+${PYSITELIB}/salt/states/boto3_elasticsearch.py
+${PYSITELIB}/salt/states/boto3_elasticsearch.pyc
+${PYSITELIB}/salt/states/boto3_elasticsearch.pyo
 ${PYSITELIB}/salt/states/boto3_route53.py
 ${PYSITELIB}/salt/states/boto3_route53.pyc
 ${PYSITELIB}/salt/states/boto3_route53.pyo
@@ -3290,6 +3612,9 @@ ${PYSITELIB}/salt/states/boto_vpc.pyo
 ${PYSITELIB}/salt/states/bower.py
 ${PYSITELIB}/salt/states/bower.pyc
 ${PYSITELIB}/salt/states/bower.pyo
+${PYSITELIB}/salt/states/btrfs.py
+${PYSITELIB}/salt/states/btrfs.pyc
+${PYSITELIB}/salt/states/btrfs.pyo
 ${PYSITELIB}/salt/states/cabal.py
 ${PYSITELIB}/salt/states/cabal.pyc
 ${PYSITELIB}/salt/states/cabal.pyo
@@ -3416,9 +3741,6 @@ ${PYSITELIB}/salt/states/git.pyo
 ${PYSITELIB}/salt/states/github.py
 ${PYSITELIB}/salt/states/github.pyc
 ${PYSITELIB}/salt/states/github.pyo
-${PYSITELIB}/salt/states/glance.py
-${PYSITELIB}/salt/states/glance.pyc
-${PYSITELIB}/salt/states/glance.pyo
 ${PYSITELIB}/salt/states/glance_image.py
 ${PYSITELIB}/salt/states/glance_image.pyc
 ${PYSITELIB}/salt/states/glance_image.pyo
@@ -3464,15 +3786,15 @@ ${PYSITELIB}/salt/states/group.pyo
 ${PYSITELIB}/salt/states/heat.py
 ${PYSITELIB}/salt/states/heat.pyc
 ${PYSITELIB}/salt/states/heat.pyo
+${PYSITELIB}/salt/states/helm.py
+${PYSITELIB}/salt/states/helm.pyc
+${PYSITELIB}/salt/states/helm.pyo
 ${PYSITELIB}/salt/states/hg.py
 ${PYSITELIB}/salt/states/hg.pyc
 ${PYSITELIB}/salt/states/hg.pyo
 ${PYSITELIB}/salt/states/highstate_doc.py
 ${PYSITELIB}/salt/states/highstate_doc.pyc
 ${PYSITELIB}/salt/states/highstate_doc.pyo
-${PYSITELIB}/salt/states/hipchat.py
-${PYSITELIB}/salt/states/hipchat.pyc
-${PYSITELIB}/salt/states/hipchat.pyo
 ${PYSITELIB}/salt/states/host.py
 ${PYSITELIB}/salt/states/host.pyc
 ${PYSITELIB}/salt/states/host.pyo
@@ -3482,6 +3804,9 @@ ${PYSITELIB}/salt/states/http.pyo
 ${PYSITELIB}/salt/states/icinga2.py
 ${PYSITELIB}/salt/states/icinga2.pyc
 ${PYSITELIB}/salt/states/icinga2.pyo
+${PYSITELIB}/salt/states/idem.py
+${PYSITELIB}/salt/states/idem.pyc
+${PYSITELIB}/salt/states/idem.pyo
 ${PYSITELIB}/salt/states/ifttt.py
 ${PYSITELIB}/salt/states/ifttt.pyc
 ${PYSITELIB}/salt/states/ifttt.pyo
@@ -3575,6 +3900,9 @@ ${PYSITELIB}/salt/states/keystone_servic
 ${PYSITELIB}/salt/states/keystone_user.py
 ${PYSITELIB}/salt/states/keystone_user.pyc
 ${PYSITELIB}/salt/states/keystone_user.pyo
+${PYSITELIB}/salt/states/keystore.py
+${PYSITELIB}/salt/states/keystore.pyc
+${PYSITELIB}/salt/states/keystore.pyo
 ${PYSITELIB}/salt/states/kmod.py
 ${PYSITELIB}/salt/states/kmod.pyc
 ${PYSITELIB}/salt/states/kmod.pyo
@@ -3761,6 +4089,9 @@ ${PYSITELIB}/salt/states/ntp.pyo
 ${PYSITELIB}/salt/states/nxos.py
 ${PYSITELIB}/salt/states/nxos.pyc
 ${PYSITELIB}/salt/states/nxos.pyo
+${PYSITELIB}/salt/states/nxos_upgrade.py
+${PYSITELIB}/salt/states/nxos_upgrade.pyc
+${PYSITELIB}/salt/states/nxos_upgrade.pyo
 ${PYSITELIB}/salt/states/openstack_config.py
 ${PYSITELIB}/salt/states/openstack_config.pyc
 ${PYSITELIB}/salt/states/openstack_config.pyo
@@ -3887,6 +4218,9 @@ ${PYSITELIB}/salt/states/rabbitmq_plugin
 ${PYSITELIB}/salt/states/rabbitmq_policy.py
 ${PYSITELIB}/salt/states/rabbitmq_policy.pyc
 ${PYSITELIB}/salt/states/rabbitmq_policy.pyo
+${PYSITELIB}/salt/states/rabbitmq_upstream.py
+${PYSITELIB}/salt/states/rabbitmq_upstream.pyc
+${PYSITELIB}/salt/states/rabbitmq_upstream.pyo
 ${PYSITELIB}/salt/states/rabbitmq_user.py
 ${PYSITELIB}/salt/states/rabbitmq_user.pyc
 ${PYSITELIB}/salt/states/rabbitmq_user.pyo
@@ -3920,6 +4254,9 @@ ${PYSITELIB}/salt/states/salt_proxy.pyo
 ${PYSITELIB}/salt/states/saltmod.py
 ${PYSITELIB}/salt/states/saltmod.pyc
 ${PYSITELIB}/salt/states/saltmod.pyo
+${PYSITELIB}/salt/states/saltutil.py
+${PYSITELIB}/salt/states/saltutil.pyc
+${PYSITELIB}/salt/states/saltutil.pyo
 ${PYSITELIB}/salt/states/schedule.py
 ${PYSITELIB}/salt/states/schedule.pyc
 ${PYSITELIB}/salt/states/schedule.pyo
@@ -4100,6 +4437,9 @@ ${PYSITELIB}/salt/states/wordpress.pyo
 ${PYSITELIB}/salt/states/x509.py
 ${PYSITELIB}/salt/states/x509.pyc
 ${PYSITELIB}/salt/states/x509.pyo
+${PYSITELIB}/salt/states/xml.py
+${PYSITELIB}/salt/states/xml.pyc
+${PYSITELIB}/salt/states/xml.pyo
 ${PYSITELIB}/salt/states/xmpp.py
 ${PYSITELIB}/salt/states/xmpp.pyc
 ${PYSITELIB}/salt/states/xmpp.pyo
@@ -4172,18 +4512,18 @@ ${PYSITELIB}/salt/templates/git/ssh-id-w
 ${PYSITELIB}/salt/templates/lxc/salt_tarball
 ${PYSITELIB}/salt/templates/rh_ip/conf.jinja
 ${PYSITELIB}/salt/templates/rh_ip/network.jinja
-${PYSITELIB}/salt/templates/rh_ip/rh5_eth.jinja
-${PYSITELIB}/salt/templates/rh_ip/rh6_eth.jinja
 ${PYSITELIB}/salt/templates/rh_ip/rh6_route_eth.jinja
 ${PYSITELIB}/salt/templates/rh_ip/rh7_eth.jinja
+${PYSITELIB}/salt/templates/rh_ip/rh8_eth.jinja
 ${PYSITELIB}/salt/templates/rh_ip/route_eth.jinja
+${PYSITELIB}/salt/templates/virt/libvirt_chardevs.jinja
+${PYSITELIB}/salt/templates/virt/libvirt_disks.jinja
 ${PYSITELIB}/salt/templates/virt/libvirt_domain.jinja
+${PYSITELIB}/salt/templates/virt/libvirt_macros.jinja
 ${PYSITELIB}/salt/templates/virt/libvirt_network.jinja
 ${PYSITELIB}/salt/templates/virt/libvirt_pool.jinja
+${PYSITELIB}/salt/templates/virt/libvirt_secret.jinja
 ${PYSITELIB}/salt/templates/virt/libvirt_volume.jinja
-${PYSITELIB}/salt/textformat.py
-${PYSITELIB}/salt/textformat.pyc
-${PYSITELIB}/salt/textformat.pyo
 ${PYSITELIB}/salt/thorium/__init__.py
 ${PYSITELIB}/salt/thorium/__init__.pyc
 ${PYSITELIB}/salt/thorium/__init__.pyo
@@ -4268,9 +4608,6 @@ ${PYSITELIB}/salt/transport/mixins/__ini
 ${PYSITELIB}/salt/transport/mixins/auth.py
 ${PYSITELIB}/salt/transport/mixins/auth.pyc
 ${PYSITELIB}/salt/transport/mixins/auth.pyo
-${PYSITELIB}/salt/transport/raet.py
-${PYSITELIB}/salt/transport/raet.pyc
-${PYSITELIB}/salt/transport/raet.pyo
 ${PYSITELIB}/salt/transport/server.py
 ${PYSITELIB}/salt/transport/server.pyc
 ${PYSITELIB}/salt/transport/server.pyo
@@ -4301,6 +4638,12 @@ ${PYSITELIB}/salt/utils/aws.pyo
 ${PYSITELIB}/salt/utils/azurearm.py
 ${PYSITELIB}/salt/utils/azurearm.pyc
 ${PYSITELIB}/salt/utils/azurearm.pyo
+${PYSITELIB}/salt/utils/beacons.py
+${PYSITELIB}/salt/utils/beacons.pyc
+${PYSITELIB}/salt/utils/beacons.pyo
+${PYSITELIB}/salt/utils/boto3_elasticsearch.py
+${PYSITELIB}/salt/utils/boto3_elasticsearch.pyc
+${PYSITELIB}/salt/utils/boto3_elasticsearch.pyo
 ${PYSITELIB}/salt/utils/boto3mod.py
 ${PYSITELIB}/salt/utils/boto3mod.pyc
 ${PYSITELIB}/salt/utils/boto3mod.pyo
@@ -4355,9 +4698,6 @@ ${PYSITELIB}/salt/utils/decorators/jinja
 ${PYSITELIB}/salt/utils/decorators/path.py
 ${PYSITELIB}/salt/utils/decorators/path.pyc
 ${PYSITELIB}/salt/utils/decorators/path.pyo
-${PYSITELIB}/salt/utils/decorators/signature.py
-${PYSITELIB}/salt/utils/decorators/signature.pyc
-${PYSITELIB}/salt/utils/decorators/signature.pyo
 ${PYSITELIB}/salt/utils/decorators/state.py
 ${PYSITELIB}/salt/utils/decorators/state.pyc
 ${PYSITELIB}/salt/utils/decorators/state.pyo
@@ -4376,21 +4716,24 @@ ${PYSITELIB}/salt/utils/dns.pyo
 ${PYSITELIB}/salt/utils/doc.py
 ${PYSITELIB}/salt/utils/doc.pyc
 ${PYSITELIB}/salt/utils/doc.pyo
-${PYSITELIB}/salt/utils/docker/__init__.py
-${PYSITELIB}/salt/utils/docker/__init__.pyc
-${PYSITELIB}/salt/utils/docker/__init__.pyo
-${PYSITELIB}/salt/utils/docker/translate/__init__.py
-${PYSITELIB}/salt/utils/docker/translate/__init__.pyc
-${PYSITELIB}/salt/utils/docker/translate/__init__.pyo
-${PYSITELIB}/salt/utils/docker/translate/container.py
-${PYSITELIB}/salt/utils/docker/translate/container.pyc
-${PYSITELIB}/salt/utils/docker/translate/container.pyo
-${PYSITELIB}/salt/utils/docker/translate/helpers.py
-${PYSITELIB}/salt/utils/docker/translate/helpers.pyc
-${PYSITELIB}/salt/utils/docker/translate/helpers.pyo
-${PYSITELIB}/salt/utils/docker/translate/network.py
-${PYSITELIB}/salt/utils/docker/translate/network.pyc
-${PYSITELIB}/salt/utils/docker/translate/network.pyo
+${PYSITELIB}/salt/utils/dockermod/__init__.py
+${PYSITELIB}/salt/utils/dockermod/__init__.pyc
+${PYSITELIB}/salt/utils/dockermod/__init__.pyo
+${PYSITELIB}/salt/utils/dockermod/translate/__init__.py
+${PYSITELIB}/salt/utils/dockermod/translate/__init__.pyc
+${PYSITELIB}/salt/utils/dockermod/translate/__init__.pyo
+${PYSITELIB}/salt/utils/dockermod/translate/container.py
+${PYSITELIB}/salt/utils/dockermod/translate/container.pyc
+${PYSITELIB}/salt/utils/dockermod/translate/container.pyo
+${PYSITELIB}/salt/utils/dockermod/translate/helpers.py
+${PYSITELIB}/salt/utils/dockermod/translate/helpers.pyc
+${PYSITELIB}/salt/utils/dockermod/translate/helpers.pyo
+${PYSITELIB}/salt/utils/dockermod/translate/network.py
+${PYSITELIB}/salt/utils/dockermod/translate/network.pyc
+${PYSITELIB}/salt/utils/dockermod/translate/network.pyo
+${PYSITELIB}/salt/utils/entrypoints.py
+${PYSITELIB}/salt/utils/entrypoints.pyc
+${PYSITELIB}/salt/utils/entrypoints.pyo
 ${PYSITELIB}/salt/utils/environment.py
 ${PYSITELIB}/salt/utils/environment.pyc
 ${PYSITELIB}/salt/utils/environment.pyo
@@ -4445,6 +4788,9 @@ ${PYSITELIB}/salt/utils/iam.pyo
 ${PYSITELIB}/salt/utils/icinga2.py
 ${PYSITELIB}/salt/utils/icinga2.pyc
 ${PYSITELIB}/salt/utils/icinga2.pyo
+${PYSITELIB}/salt/utils/idem.py
+${PYSITELIB}/salt/utils/idem.pyc
+${PYSITELIB}/salt/utils/idem.pyo
 ${PYSITELIB}/salt/utils/immutabletypes.py
 ${PYSITELIB}/salt/utils/immutabletypes.pyc
 ${PYSITELIB}/salt/utils/immutabletypes.pyo
@@ -4496,6 +4842,9 @@ ${PYSITELIB}/salt/utils/memcached.pyo
 ${PYSITELIB}/salt/utils/migrations.py
 ${PYSITELIB}/salt/utils/migrations.pyc
 ${PYSITELIB}/salt/utils/migrations.pyo
+${PYSITELIB}/salt/utils/mine.py
+${PYSITELIB}/salt/utils/mine.pyc
+${PYSITELIB}/salt/utils/mine.pyo
 ${PYSITELIB}/salt/utils/minion.py
 ${PYSITELIB}/salt/utils/minion.pyc
 ${PYSITELIB}/salt/utils/minion.pyo
@@ -4508,6 +4857,9 @@ ${PYSITELIB}/salt/utils/mount.pyo
 ${PYSITELIB}/salt/utils/msazure.py
 ${PYSITELIB}/salt/utils/msazure.pyc
 ${PYSITELIB}/salt/utils/msazure.pyo
+${PYSITELIB}/salt/utils/msgpack.py
+${PYSITELIB}/salt/utils/msgpack.pyc
+${PYSITELIB}/salt/utils/msgpack.pyo
 ${PYSITELIB}/salt/utils/nacl.py
 ${PYSITELIB}/salt/utils/nacl.pyc
 ${PYSITELIB}/salt/utils/nacl.pyo
@@ -4523,6 +4875,9 @@ ${PYSITELIB}/salt/utils/nb_popen.pyo
 ${PYSITELIB}/salt/utils/network.py
 ${PYSITELIB}/salt/utils/network.pyc
 ${PYSITELIB}/salt/utils/network.pyo
+${PYSITELIB}/salt/utils/nxos.py
+${PYSITELIB}/salt/utils/nxos.pyc
+${PYSITELIB}/salt/utils/nxos.pyo
 ${PYSITELIB}/salt/utils/nxos_api.py
 ${PYSITELIB}/salt/utils/nxos_api.pyc
 ${PYSITELIB}/salt/utils/nxos_api.pyo
@@ -4592,6 +4947,9 @@ ${PYSITELIB}/salt/utils/process.pyo
 ${PYSITELIB}/salt/utils/profile.py
 ${PYSITELIB}/salt/utils/profile.pyc
 ${PYSITELIB}/salt/utils/profile.pyo
+${PYSITELIB}/salt/utils/proxy.py
+${PYSITELIB}/salt/utils/proxy.pyc
+${PYSITELIB}/salt/utils/proxy.pyo
 ${PYSITELIB}/salt/utils/psutil_compat.py
 ${PYSITELIB}/salt/utils/psutil_compat.pyc
 ${PYSITELIB}/salt/utils/psutil_compat.pyo
@@ -4607,12 +4965,6 @@ ${PYSITELIB}/salt/utils/pydsl.pyo
 ${PYSITELIB}/salt/utils/pyobjects.py
 ${PYSITELIB}/salt/utils/pyobjects.pyc
 ${PYSITELIB}/salt/utils/pyobjects.pyo
-${PYSITELIB}/salt/utils/raetevent.py
-${PYSITELIB}/salt/utils/raetevent.pyc
-${PYSITELIB}/salt/utils/raetevent.pyo
-${PYSITELIB}/salt/utils/raetlane.py
-${PYSITELIB}/salt/utils/raetlane.pyc
-${PYSITELIB}/salt/utils/raetlane.pyo
 ${PYSITELIB}/salt/utils/reactor.py
 ${PYSITELIB}/salt/utils/reactor.pyc
 ${PYSITELIB}/salt/utils/reactor.pyo
@@ -4673,6 +5025,9 @@ ${PYSITELIB}/salt/utils/systemd.pyo
 ${PYSITELIB}/salt/utils/templates.py
 ${PYSITELIB}/salt/utils/templates.pyc
 ${PYSITELIB}/salt/utils/templates.pyo
+${PYSITELIB}/salt/utils/textformat.py
+${PYSITELIB}/salt/utils/textformat.pyc
+${PYSITELIB}/salt/utils/textformat.pyo
 ${PYSITELIB}/salt/utils/thin.py
 ${PYSITELIB}/salt/utils/thin.pyc
 ${PYSITELIB}/salt/utils/thin.pyo
@@ -4733,9 +5088,15 @@ ${PYSITELIB}/salt/utils/vt.pyo
 ${PYSITELIB}/salt/utils/vt_helper.py
 ${PYSITELIB}/salt/utils/vt_helper.pyc
 ${PYSITELIB}/salt/utils/vt_helper.pyo
+${PYSITELIB}/salt/utils/win_chcp.py
+${PYSITELIB}/salt/utils/win_chcp.pyc
+${PYSITELIB}/salt/utils/win_chcp.pyo
 ${PYSITELIB}/salt/utils/win_dacl.py
 ${PYSITELIB}/salt/utils/win_dacl.pyc
 ${PYSITELIB}/salt/utils/win_dacl.pyo
+${PYSITELIB}/salt/utils/win_dotnet.py
+${PYSITELIB}/salt/utils/win_dotnet.pyc
+${PYSITELIB}/salt/utils/win_dotnet.pyo
 ${PYSITELIB}/salt/utils/win_functions.py
 ${PYSITELIB}/salt/utils/win_functions.pyc
 ${PYSITELIB}/salt/utils/win_functions.pyo
@@ -4745,6 +5106,9 @@ ${PYSITELIB}/salt/utils/win_lgpo_auditpo
 ${PYSITELIB}/salt/utils/win_lgpo_netsh.py
 ${PYSITELIB}/salt/utils/win_lgpo_netsh.pyc
 ${PYSITELIB}/salt/utils/win_lgpo_netsh.pyo
+${PYSITELIB}/salt/utils/win_network.py
+${PYSITELIB}/salt/utils/win_network.pyc
+${PYSITELIB}/salt/utils/win_network.pyo
 ${PYSITELIB}/salt/utils/win_osinfo.py
 ${PYSITELIB}/salt/utils/win_osinfo.pyc
 ${PYSITELIB}/salt/utils/win_osinfo.pyo
@@ -4757,6 +5121,12 @@ ${PYSITELIB}/salt/utils/win_reg.pyo
 ${PYSITELIB}/salt/utils/win_runas.py
 ${PYSITELIB}/salt/utils/win_runas.pyc
 ${PYSITELIB}/salt/utils/win_runas.pyo
+${PYSITELIB}/salt/utils/win_service.py
+${PYSITELIB}/salt/utils/win_service.pyc
+${PYSITELIB}/salt/utils/win_service.pyo
+${PYSITELIB}/salt/utils/win_system.py
+${PYSITELIB}/salt/utils/win_system.pyc
+${PYSITELIB}/salt/utils/win_system.pyo
 ${PYSITELIB}/salt/utils/win_update.py
 ${PYSITELIB}/salt/utils/win_update.pyc
 ${PYSITELIB}/salt/utils/win_update.pyo

Index: pkgsrc/sysutils/salt/distinfo
diff -u pkgsrc/sysutils/salt/distinfo:1.44 pkgsrc/sysutils/salt/distinfo:1.45
--- pkgsrc/sysutils/salt/distinfo:1.44  Tue Oct 26 11:20:11 2021
+++ pkgsrc/sysutils/salt/distinfo       Sun Nov 14 20:01:17 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.44 2021/10/26 11:20:11 nia Exp $
+$NetBSD: distinfo,v 1.45 2021/11/14 20:01:17 adam Exp $
 
-BLAKE2s (salt-2019.2.2.tar.gz) = d1fd8ecfc338858f8d2ef06673190acf37af032503c0877c8f98cd4a97bf202a
-SHA512 (salt-2019.2.2.tar.gz) = 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
-Size (salt-2019.2.2.tar.gz) = 14420887 bytes
-SHA1 (patch-salt_version.py) = 1827dac3609a938fae38ee5dfd2a873c9723dfbd
+BLAKE2s (salt-3004.tar.gz) = 0cd3a091dffd079f8ce020c365e93012ad659897d6aa2daf346bdd4f74fd6a0b
+SHA512 (salt-3004.tar.gz) = edc609daa5ccb4521950fa0df06383e502b49691e0a9f410f6985f3d1cb127905f89c3b0c88ffb88acf082dfa2011b6dd1aa714666c6af6ad09135aceb7dd228
+Size (salt-3004.tar.gz) = 17663985 bytes
+SHA1 (patch-salt_version.py) = 45f9552d286ec03a38efe9e6655ff520334f31db

Index: pkgsrc/sysutils/salt-docs/Makefile
diff -u pkgsrc/sysutils/salt-docs/Makefile:1.25 pkgsrc/sysutils/salt-docs/Makefile:1.26
--- pkgsrc/sysutils/salt-docs/Makefile:1.25     Mon Dec  9 16:52:51 2019
+++ pkgsrc/sysutils/salt-docs/Makefile  Sun Nov 14 20:01:17 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2019/12/09 16:52:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2021/11/14 20:01:17 adam Exp $
 
-DISTNAME=      salt-2019.2.2
+DISTNAME=      salt-3004
 PKGNAME=       ${DISTNAME:S/-/-docs-/}
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
@@ -13,6 +13,7 @@ LICENSE=      apache-2.0
 USE_TOOLS+=    gmake pax
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.2.3nb1*:../../textproc/py-sphinx1
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sqlite3>=1.2.3nb1*:../../databases/py-sqlite3
 
 NO_CONFIGURE=  yes
 BUILD_DIRS=    doc
@@ -25,7 +26,7 @@ PLIST_SRC=    ${WRKDIR}/.PLIST_SRC
 
 INSTALLATION_DIRS=     ${HTMLDIR}
 
-PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 # Contains hardcoded paths that may refer to paths used during the build, for
 # example /opt/tools on SmartOS.

Index: pkgsrc/sysutils/salt-docs/distinfo
diff -u pkgsrc/sysutils/salt-docs/distinfo:1.14 pkgsrc/sysutils/salt-docs/distinfo:1.15
--- pkgsrc/sysutils/salt-docs/distinfo:1.14     Tue Oct 26 11:20:11 2021
+++ pkgsrc/sysutils/salt-docs/distinfo  Sun Nov 14 20:01:17 2021
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 11:20:11 nia Exp $
+$NetBSD: distinfo,v 1.15 2021/11/14 20:01:17 adam Exp $
 
-BLAKE2s (salt-2019.2.2.tar.gz) = d1fd8ecfc338858f8d2ef06673190acf37af032503c0877c8f98cd4a97bf202a
-SHA512 (salt-2019.2.2.tar.gz) = 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
-Size (salt-2019.2.2.tar.gz) = 14420887 bytes
+BLAKE2s (salt-3004.tar.gz) = 0cd3a091dffd079f8ce020c365e93012ad659897d6aa2daf346bdd4f74fd6a0b
+SHA512 (salt-3004.tar.gz) = edc609daa5ccb4521950fa0df06383e502b49691e0a9f410f6985f3d1cb127905f89c3b0c88ffb88acf082dfa2011b6dd1aa714666c6af6ad09135aceb7dd228
+Size (salt-3004.tar.gz) = 17663985 bytes

Index: pkgsrc/sysutils/salt/patches/patch-salt_version.py
diff -u pkgsrc/sysutils/salt/patches/patch-salt_version.py:1.1 pkgsrc/sysutils/salt/patches/patch-salt_version.py:1.2
--- pkgsrc/sysutils/salt/patches/patch-salt_version.py:1.1      Wed Feb  7 11:11:23 2018
+++ pkgsrc/sysutils/salt/patches/patch-salt_version.py  Sun Nov 14 20:01:17 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-salt_version.py,v 1.1 2018/02/07 11:11:23 adam Exp $
+$NetBSD: patch-salt_version.py,v 1.2 2021/11/14 20:01:17 adam Exp $
 
 Correctly detect py-cryptodome (the drop-in replacement for py-crypto).
 
---- salt/version.py.orig       2018-02-07 10:27:26.000000000 +0000
+--- salt/version.py.orig       2021-10-12 15:43:35.000000000 +0000
 +++ salt/version.py
-@@ -581,7 +581,7 @@ def dependency_information(include_salt_
-         ('msgpack-python', 'msgpack', 'version'),
-         ('msgpack-pure', 'msgpack_pure', 'version'),
-         ('pycrypto', 'Crypto', '__version__'),
--        ('pycryptodome', 'Cryptodome', 'version_info'),
-+        ('pycryptodome', 'Crypto', 'version_info'),
-         ('libnacl', 'libnacl', '__version__'),
-         ('PyYAML', 'yaml', '__version__'),
-         ('ioflo', 'ioflo', '__version__'),
+@@ -699,7 +699,7 @@ def dependency_information(include_salt_
+         ("msgpack", "msgpack", "version"),
+         ("msgpack-pure", "msgpack_pure", "version"),
+         ("pycrypto", "Crypto", "__version__"),
+-        ("pycryptodome", "Cryptodome", "version_info"),
++        ("pycryptodome", "Crypto", "version_info"),
+         ("PyYAML", "yaml", "__version__"),
+         ("PyZMQ", "zmq", "__version__"),
+         ("ZMQ", "zmq", "zmq_version"),