sysutils/py-salt: upgrade to 2015.5.1

- upgrade to 2015.5.1
- add options for raet, and zeromq

PR:		200044
Submitted by:	Christer Edwards <christer.edwards@gmail.com>

7 files changed, 320 insertions, 30 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index b3c79a74b3e..4d6de84184d 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2014.7.5
+PORTVERSION=	2015.5.1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,18 +12,30 @@ COMMENT=	Distributed remote execution and configuration management system
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.13:${PORTSDIR}/devel/py-msgpack \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \
 		${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
 		${PYTHON_PKGNAMEPREFIX}requests>1:${PORTSDIR}/www/py-requests \
-		lsof>0:${PORTSDIR}/sysutils/lsof
+		${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34 \
+		${PYTHON_PKGNAMEPREFIX}progressbar>0:${PORTSDIR}/misc/py-progressbar
+
+OPTIONS_DEFINE=	ZEROMQ RAET
+OPTIONS_DEFAULT=	ZEROMQ
+
+ZEROMQ_DESC=	Enable ZeroMQ transport
+RAET_DESC=	Enable RAET transport
+
+ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq
+ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+
+RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:${PORTSDIR}/security/py-libnacl \
+		${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:${PORTSDIR}/devel/py-ioflo \
+		${PYTHON_PKGNAMEPREFIX}raet>0:${PORTSDIR}/net/py-raet
 
 USES=		python:2
 USE_PYTHON=	distutils
@@ -40,7 +52,7 @@ PYDISTUTILS_INSTALLARGS+=\
 		--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
 		--salt-base-master-roots-dir=${ETCDIR}/salt-master \
 		--salt-logs-dir=/var/log/salt \
-		--salt-pidfile-dir=/var/run
+		--salt-pidfile-dir=/var/run \
 
 USE_RC_SUBR=	salt_master \
 		salt_minion \
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index 45ca7fb4d48..7668f1ef384 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-2014.7.5.tar.gz) = 474d0a23866e42c664f46e04bc8ead87fc57ee16ff2cc8945248f1e0706f6eb8
-SIZE (salt-2014.7.5.tar.gz) = 3845643
+SHA256 (salt-2015.5.1.tar.gz) = 0edb1d0584f53e805ad6ffc21c163a637b23d187052ba2dbb7e641c2d7099c4d
+SIZE (salt-2015.5.1.tar.gz) = 4970135
diff --git a/sysutils/py-salt/files/patch-salt__grains__core.py b/sysutils/py-salt/files/patch-salt__grains__core.py
index 2f2e9c17a27..d9df10f5b8e 100644
--- a/sysutils/py-salt/files/patch-salt__grains__core.py
+++ b/sysutils/py-salt/files/patch-salt__grains__core.py
@@ -1,6 +1,6 @@
---- salt/grains/core.py.orig	2015-01-24 14:54:03.078736129 -0700
-+++ salt/grains/core.py	2015-01-24 14:53:12.000000000 -0700
-@@ -1321,7 +1321,7 @@
+--- salt/grains/core.py.orig	2015-04-17 18:44:50 UTC
++++ salt/grains/core.py
+@@ -1387,7 +1387,7 @@ def path():
      '''
      # Provides:
      #   path
diff --git a/sysutils/py-salt/files/patch-salt__utils____init__.py b/sysutils/py-salt/files/patch-salt__utils____init__.py
index c6111cc13e3..fc9561be3b2 100644
--- a/sysutils/py-salt/files/patch-salt__utils____init__.py
+++ b/sysutils/py-salt/files/patch-salt__utils____init__.py
@@ -1,7 +1,7 @@
---- ./salt/utils/__init__.py.orig	2014-02-19 22:21:15.000000000 +0200
-+++ ./salt/utils/__init__.py	2014-03-06 10:50:07.000000000 +0200
-@@ -316,6 +316,15 @@
-         if os.access(exe, os.X_OK):
+--- salt/utils/__init__.py.orig	2015-04-17 18:44:50 UTC
++++ salt/utils/__init__.py
+@@ -372,6 +372,15 @@ def which(exe=None):
+             # executable in cwd or fullpath
              return exe
  
 +        p = os.environ.get('PATH')
diff --git a/sysutils/py-salt/files/patch-setup.py b/sysutils/py-salt/files/patch-setup.py
index 34c93a4840c..4090a0bc5cf 100644
--- a/sysutils/py-salt/files/patch-setup.py
+++ b/sysutils/py-salt/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2015-01-24 14:55:05.507732433 -0700
-+++ setup.py	2015-01-24 14:59:07.595716022 -0700
-@@ -621,8 +621,8 @@
+--- setup.py.orig	2015-04-17 18:44:50 UTC
++++ setup.py
+@@ -623,8 +623,8 @@ class SaltDistribution(distutils.dist.Di
      def _property_data_files(self):
          # Data files common to all scenarios
          data_files = [
diff --git a/sysutils/py-salt/files/pkg-message.in b/sysutils/py-salt/files/pkg-message.in
index 8e282ba9fe9..8888f5dede9 100644
--- a/sysutils/py-salt/files/pkg-message.in
+++ b/sysutils/py-salt/files/pkg-message.in
@@ -5,7 +5,7 @@ To configure a Salt Master, do the following:
 
   o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
   o Update to meet your needs
-  o Set salt_master_enable="YES" in rc.conf
+  o sysrc salt_master_enable="YES"
 
 ---------------------------------------------------------------------------------------------------
 
@@ -13,8 +13,7 @@ To configure a Salt Minion, do the following:
 
   o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion
   o Update 'master: salt' to point to your Salt Master's hostname or IP
-  o Set salt_minion_enable="YES" in rc.conf
-  o Set salt_minion_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" in rc.conf
+  o sysrc salt_minion_enable="YES"
 
 ===================================================================================================
 
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 9d6ef3699d8..087196b334d 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -18,20 +18,62 @@
 %%PYTHON_SITELIBDIR%%/salt/auth/keystone.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/ldap.py
 %%PYTHON_SITELIBDIR%%/salt/auth/ldap.pyc
+%%PYTHON_SITELIBDIR%%/salt/auth/mysql.py
+%%PYTHON_SITELIBDIR%%/salt/auth/mysql.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/pam.py
 %%PYTHON_SITELIBDIR%%/salt/auth/pam.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/pki.py
 %%PYTHON_SITELIBDIR%%/salt/auth/pki.pyc
+%%PYTHON_SITELIBDIR%%/salt/auth/rest.py
+%%PYTHON_SITELIBDIR%%/salt/auth/rest.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.py
 %%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.pyc
+%%PYTHON_SITELIBDIR%%/salt/auth/yubico.py
+%%PYTHON_SITELIBDIR%%/salt/auth/yubico.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/btmp.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/btmp.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/diskusage.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/diskusage.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/inotify.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/inotify.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/journald.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/journald.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/load.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/load.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/network_info.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/network_info.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/service.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/service.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/sh.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/sh.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/twilio_txt_msg.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/twilio_txt_msg.pyc
+%%PYTHON_SITELIBDIR%%/salt/beacons/wtmp.py
+%%PYTHON_SITELIBDIR%%/salt/beacons/wtmp.pyc
 %%PYTHON_SITELIBDIR%%/salt/cli/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/cli/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/api.py
+%%PYTHON_SITELIBDIR%%/salt/cli/api.pyc
 %%PYTHON_SITELIBDIR%%/salt/cli/batch.py
 %%PYTHON_SITELIBDIR%%/salt/cli/batch.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/call.py
+%%PYTHON_SITELIBDIR%%/salt/cli/call.pyc
 %%PYTHON_SITELIBDIR%%/salt/cli/caller.py
 %%PYTHON_SITELIBDIR%%/salt/cli/caller.pyc
 %%PYTHON_SITELIBDIR%%/salt/cli/cp.py
 %%PYTHON_SITELIBDIR%%/salt/cli/cp.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/daemons.py
+%%PYTHON_SITELIBDIR%%/salt/cli/daemons.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/key.py
+%%PYTHON_SITELIBDIR%%/salt/cli/key.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/run.py
+%%PYTHON_SITELIBDIR%%/salt/cli/run.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/salt.py
+%%PYTHON_SITELIBDIR%%/salt/cli/salt.pyc
+%%PYTHON_SITELIBDIR%%/salt/cli/ssh.py
+%%PYTHON_SITELIBDIR%%/salt/cli/ssh.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/client/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/api.py
@@ -44,6 +86,8 @@
 %%PYTHON_SITELIBDIR%%/salt/client/raet/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/client.py
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/client.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/shell.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/shell.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/ssh_py_shim.py
@@ -58,8 +102,12 @@
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/cp.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/grains.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/grains.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/mine.py
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/mine.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/pillar.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/pillar.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/publish.py
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/publish.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/state.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/state.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/__init__.py
@@ -76,6 +124,8 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/cloudstack.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/digital_ocean.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/digital_ocean.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/digital_ocean_v2.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/digital_ocean_v2.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/ec2.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/ec2.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/gce.py
@@ -102,6 +152,8 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/parallels.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/proxmox.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/proxmox.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/pyrax.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/pyrax.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/rackspace.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/rackspace.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/saltify.py
@@ -146,6 +198,7 @@
 %%PYTHON_SITELIBDIR%%/salt/daemons/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/daemons/flo/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/daemons/flo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/caller.flo
 %%PYTHON_SITELIBDIR%%/salt/daemons/flo/core.py
 %%PYTHON_SITELIBDIR%%/salt/daemons/flo/core.pyc
 %%PYTHON_SITELIBDIR%%/salt/daemons/flo/maint.flo
@@ -166,18 +219,28 @@
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_master.pyc
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_minion.py
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_minion.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_multimaster.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_multimaster.pyc
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_raetkey.py
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_raetkey.pyc
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_saltkeep.py
 %%PYTHON_SITELIBDIR%%/salt/daemons/test/test_saltkeep.pyc
+%%PYTHON_SITELIBDIR%%/salt/defaults/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/defaults/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/defaults/exitcodes.py
+%%PYTHON_SITELIBDIR%%/salt/defaults/exitcodes.pyc
 %%PYTHON_SITELIBDIR%%/salt/exceptions.py
 %%PYTHON_SITELIBDIR%%/salt/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/salt/exitcodes.py
-%%PYTHON_SITELIBDIR%%/salt/exitcodes.pyc
 %%PYTHON_SITELIBDIR%%/salt/ext/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/ext/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/ext/ipaddr.py
+%%PYTHON_SITELIBDIR%%/salt/ext/ipaddr.pyc
 %%PYTHON_SITELIBDIR%%/salt/ext/six.py
 %%PYTHON_SITELIBDIR%%/salt/ext/six.pyc
+%%PYTHON_SITELIBDIR%%/salt/ext/ssl_match_hostname.py
+%%PYTHON_SITELIBDIR%%/salt/ext/ssl_match_hostname.pyc
+%%PYTHON_SITELIBDIR%%/salt/ext/win_inet_pton.py
+%%PYTHON_SITELIBDIR%%/salt/ext/win_inet_pton.pyc
 %%PYTHON_SITELIBDIR%%/salt/fileclient.py
 %%PYTHON_SITELIBDIR%%/salt/fileclient.pyc
 %%PYTHON_SITELIBDIR%%/salt/fileserver/__init__.py
@@ -204,6 +267,8 @@
 %%PYTHON_SITELIBDIR%%/salt/grains/extra.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/junos.py
 %%PYTHON_SITELIBDIR%%/salt/grains/junos.pyc
+%%PYTHON_SITELIBDIR%%/salt/grains/mdadm.py
+%%PYTHON_SITELIBDIR%%/salt/grains/mdadm.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/opts.py
 %%PYTHON_SITELIBDIR%%/salt/grains/opts.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/rest_sample.py
@@ -242,6 +307,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/aptpkg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/archive.py
 %%PYTHON_SITELIBDIR%%/salt/modules/archive.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/artifactory.py
+%%PYTHON_SITELIBDIR%%/salt/modules/artifactory.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/at.py
 %%PYTHON_SITELIBDIR%%/salt/modules/at.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/augeas_cfg.py
@@ -254,8 +321,12 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/bluez.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_asg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_asg.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_cfn.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_cfn.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_cloudwatch.py
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_cloudwatch.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_dynamodb.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_dynamodb.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_elasticache.py
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_elasticache.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_elb.py
@@ -266,6 +337,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_route53.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_secgroup.py
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_secgroup.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_sns.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_sns.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_sqs.py
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_sqs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/boto_vpc.py
@@ -276,8 +349,12 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/bridge.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/bsd_shadow.py
 %%PYTHON_SITELIBDIR%%/salt/modules/bsd_shadow.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/btrfs.py
+%%PYTHON_SITELIBDIR%%/salt/modules/btrfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.py
 %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/cassandra_cql.py
+%%PYTHON_SITELIBDIR%%/salt/modules/cassandra_cql.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/chef.py
 %%PYTHON_SITELIBDIR%%/salt/modules/chef.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/chocolatey.py
@@ -290,10 +367,16 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/composer.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/config.py
 %%PYTHON_SITELIBDIR%%/salt/modules/config.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/container_resource.py
+%%PYTHON_SITELIBDIR%%/salt/modules/container_resource.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/cp.py
 %%PYTHON_SITELIBDIR%%/salt/modules/cp.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/cpan.py
+%%PYTHON_SITELIBDIR%%/salt/modules/cpan.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/cron.py
 %%PYTHON_SITELIBDIR%%/salt/modules/cron.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/cyg.py
+%%PYTHON_SITELIBDIR%%/salt/modules/cyg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/daemontools.py
 %%PYTHON_SITELIBDIR%%/salt/modules/daemontools.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/darwin_sysctl.py
@@ -312,6 +395,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/debian_service.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/defaults.py
 %%PYTHON_SITELIBDIR%%/salt/modules/defaults.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/devmap.py
+%%PYTHON_SITELIBDIR%%/salt/modules/devmap.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/dig.py
 %%PYTHON_SITELIBDIR%%/salt/modules/dig.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/disk.py
@@ -326,10 +411,16 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/dockerio.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/dpkg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/dpkg.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/drac.py
+%%PYTHON_SITELIBDIR%%/salt/modules/drac.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/drbd.py
+%%PYTHON_SITELIBDIR%%/salt/modules/drbd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.py
 %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/eix.py
 %%PYTHON_SITELIBDIR%%/salt/modules/eix.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/elasticsearch.py
+%%PYTHON_SITELIBDIR%%/salt/modules/elasticsearch.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/environ.py
 %%PYTHON_SITELIBDIR%%/salt/modules/environ.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/eselect.py
@@ -342,6 +433,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/extfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/file.py
 %%PYTHON_SITELIBDIR%%/salt/modules/file.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/firewalld.py
+%%PYTHON_SITELIBDIR%%/salt/modules/firewalld.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsd_sysctl.py
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsd_sysctl.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsdjail.py
@@ -354,6 +447,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsdports.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsdservice.py
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsdservice.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/fsutils.py
+%%PYTHON_SITELIBDIR%%/salt/modules/fsutils.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/gem.py
 %%PYTHON_SITELIBDIR%%/salt/modules/gem.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/genesis.py
@@ -370,6 +465,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/glusterfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/gnomedesktop.py
 %%PYTHON_SITELIBDIR%%/salt/modules/gnomedesktop.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/gpg.py
+%%PYTHON_SITELIBDIR%%/salt/modules/gpg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/grains.py
 %%PYTHON_SITELIBDIR%%/salt/modules/grains.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/groupadd.py
@@ -386,10 +483,16 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/hashutil.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/hg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/hg.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/hipchat.py
+%%PYTHON_SITELIBDIR%%/salt/modules/hipchat.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/hosts.py
 %%PYTHON_SITELIBDIR%%/salt/modules/hosts.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/htpasswd.py
 %%PYTHON_SITELIBDIR%%/salt/modules/htpasswd.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/http.py
+%%PYTHON_SITELIBDIR%%/salt/modules/http.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/ilo.py
+%%PYTHON_SITELIBDIR%%/salt/modules/ilo.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/img.py
 %%PYTHON_SITELIBDIR%%/salt/modules/img.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/incron.py
@@ -400,10 +503,16 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/ini_manage.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/introspect.py
 %%PYTHON_SITELIBDIR%%/salt/modules/introspect.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/ipmi.py
+%%PYTHON_SITELIBDIR%%/salt/modules/ipmi.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/ipset.py
 %%PYTHON_SITELIBDIR%%/salt/modules/ipset.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/iptables.py
 %%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/jboss7.py
+%%PYTHON_SITELIBDIR%%/salt/modules/jboss7.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/jboss7_cli.py
+%%PYTHON_SITELIBDIR%%/salt/modules/jboss7_cli.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/junos.py
 %%PYTHON_SITELIBDIR%%/salt/modules/junos.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/key.py
@@ -470,14 +579,20 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/munin.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/mysql.py
 %%PYTHON_SITELIBDIR%%/salt/modules/mysql.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/nacl.py
+%%PYTHON_SITELIBDIR%%/salt/modules/nacl.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/nagios.py
 %%PYTHON_SITELIBDIR%%/salt/modules/nagios.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsd_sysctl.py
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsd_sysctl.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsdservice.py
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsdservice.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/netscaler.py
+%%PYTHON_SITELIBDIR%%/salt/modules/netscaler.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/network.py
 %%PYTHON_SITELIBDIR%%/salt/modules/network.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/neutron.py
+%%PYTHON_SITELIBDIR%%/salt/modules/neutron.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/nfs3.py
 %%PYTHON_SITELIBDIR%%/salt/modules/nfs3.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/nftables.py
@@ -490,8 +605,12 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/npm.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/omapi.py
 %%PYTHON_SITELIBDIR%%/salt/modules/omapi.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/openbsd_sysctl.py
+%%PYTHON_SITELIBDIR%%/salt/modules/openbsd_sysctl.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/openbsdpkg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/openbsdpkg.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/openbsdrcctl.py
+%%PYTHON_SITELIBDIR%%/salt/modules/openbsdrcctl.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/openbsdservice.py
 %%PYTHON_SITELIBDIR%%/salt/modules/openbsdservice.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/openstack_config.py
@@ -554,6 +673,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/rabbitmq.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/raet_publish.py
 %%PYTHON_SITELIBDIR%%/salt/modules/raet_publish.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/random_org.py
+%%PYTHON_SITELIBDIR%%/salt/modules/random_org.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rbenv.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rbenv.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rdp.py
@@ -580,6 +701,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/rpm.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rsync.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rsync.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/runit.py
+%%PYTHON_SITELIBDIR%%/salt/modules/runit.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rvm.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rvm.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/s3.py
@@ -590,6 +713,10 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/saltutil.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/schedule.py
 %%PYTHON_SITELIBDIR%%/salt/modules/schedule.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/scsi.py
+%%PYTHON_SITELIBDIR%%/salt/modules/scsi.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/sdb.py
+%%PYTHON_SITELIBDIR%%/salt/modules/sdb.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/seed.py
 %%PYTHON_SITELIBDIR%%/salt/modules/seed.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/selinux.py
@@ -602,6 +729,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/service.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/shadow.py
 %%PYTHON_SITELIBDIR%%/salt/modules/shadow.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/slack_notify.py
+%%PYTHON_SITELIBDIR%%/salt/modules/slack_notify.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/smartos_imgadm.py
 %%PYTHON_SITELIBDIR%%/salt/modules/smartos_imgadm.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/smartos_vmadm.py
@@ -618,10 +747,14 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/solaris_shadow.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/solaris_user.py
 %%PYTHON_SITELIBDIR%%/salt/modules/solaris_user.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/solarisips.py
+%%PYTHON_SITELIBDIR%%/salt/modules/solarisips.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/solarispkg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/solarispkg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/solr.py
 %%PYTHON_SITELIBDIR%%/salt/modules/solr.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/splunk_search.py
+%%PYTHON_SITELIBDIR%%/salt/modules/splunk_search.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/sqlite3.py
 %%PYTHON_SITELIBDIR%%/salt/modules/sqlite3.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/ssh.py
@@ -630,6 +763,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/state.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/status.py
 %%PYTHON_SITELIBDIR%%/salt/modules/status.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/sudo.py
+%%PYTHON_SITELIBDIR%%/salt/modules/sudo.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/supervisord.py
 %%PYTHON_SITELIBDIR%%/salt/modules/supervisord.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/svn.py
@@ -638,14 +773,22 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/swift.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/sysbench.py
 %%PYTHON_SITELIBDIR%%/salt/modules/sysbench.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/syslog_ng.py
+%%PYTHON_SITELIBDIR%%/salt/modules/syslog_ng.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/sysmod.py
 %%PYTHON_SITELIBDIR%%/salt/modules/sysmod.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/sysrc.py
+%%PYTHON_SITELIBDIR%%/salt/modules/sysrc.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/system.py
 %%PYTHON_SITELIBDIR%%/salt/modules/system.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py
+%%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py
 %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/test.py
 %%PYTHON_SITELIBDIR%%/salt/modules/test.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/test_virtual.py
+%%PYTHON_SITELIBDIR%%/salt/modules/test_virtual.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/timezone.py
 %%PYTHON_SITELIBDIR%%/salt/modules/timezone.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/tls.py
@@ -662,6 +805,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/uwsgi.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/varnish.py
 %%PYTHON_SITELIBDIR%%/salt/modules/varnish.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/vbox_guest.py
+%%PYTHON_SITELIBDIR%%/salt/modules/vbox_guest.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/virt.py
 %%PYTHON_SITELIBDIR%%/salt/modules/virt.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/virtualenv_mod.py
@@ -708,6 +853,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/win_useradd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/xapi.py
 %%PYTHON_SITELIBDIR%%/salt/modules/xapi.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/xfs.py
+%%PYTHON_SITELIBDIR%%/salt/modules/xfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/xmpp.py
 %%PYTHON_SITELIBDIR%%/salt/modules/xmpp.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/yumpkg.py
@@ -716,6 +863,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/zcbuildout.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/zfs.py
 %%PYTHON_SITELIBDIR%%/salt/modules/zfs.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/zk_concurrency.py
+%%PYTHON_SITELIBDIR%%/salt/modules/zk_concurrency.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/znc.py
 %%PYTHON_SITELIBDIR%%/salt/modules/znc.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/zpool.py
@@ -750,8 +899,6 @@
 %%PYTHON_SITELIBDIR%%/salt/output/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/compact.py
 %%PYTHON_SITELIBDIR%%/salt/output/compact.pyc
-%%PYTHON_SITELIBDIR%%/salt/output/grains.py
-%%PYTHON_SITELIBDIR%%/salt/output/grains.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/highstate.py
 %%PYTHON_SITELIBDIR%%/salt/output/highstate.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/json_out.py
@@ -770,6 +917,8 @@
 %%PYTHON_SITELIBDIR%%/salt/output/overstatestage.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/pprint_out.py
 %%PYTHON_SITELIBDIR%%/salt/output/pprint_out.pyc
+%%PYTHON_SITELIBDIR%%/salt/output/progress.py
+%%PYTHON_SITELIBDIR%%/salt/output/progress.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/raw.py
 %%PYTHON_SITELIBDIR%%/salt/output/raw.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/txt.py
@@ -794,8 +943,12 @@
 %%PYTHON_SITELIBDIR%%/salt/pillar/cobbler.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/django_orm.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/django_orm.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/ec2_pillar.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/ec2_pillar.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/etcd_pillar.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/etcd_pillar.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/file_tree.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/file_tree.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/foreman.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/foreman.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/git_pillar.py
@@ -808,6 +961,8 @@
 %%PYTHON_SITELIBDIR%%/salt/pillar/mongo.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/mysql.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/mysql.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/neutron.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/neutron.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/pepa.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/pepa.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/pillar_ldap.py
@@ -822,6 +977,8 @@
 %%PYTHON_SITELIBDIR%%/salt/pillar/s3.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/svn_pillar.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/svn_pillar.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/varstack_pillar.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/varstack_pillar.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/virtkey.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/virtkey.pyc
 %%PYTHON_SITELIBDIR%%/salt/proxy/__init__.py
@@ -836,6 +993,10 @@
 %%PYTHON_SITELIBDIR%%/salt/queues/sqlite_queue.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/renderers/cheetah.py
+%%PYTHON_SITELIBDIR%%/salt/renderers/cheetah.pyc
+%%PYTHON_SITELIBDIR%%/salt/renderers/genshi.py
+%%PYTHON_SITELIBDIR%%/salt/renderers/genshi.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/gpg.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/gpg.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/jinja.py
@@ -864,16 +1025,24 @@
 %%PYTHON_SITELIBDIR%%/salt/returners/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/carbon_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/carbon_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/cassandra_cql_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/cassandra_cql_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/cassandra_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/cassandra_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/couchbase_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/couchbase_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/couchdb_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/couchdb_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/django_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/django_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/elasticsearch_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/elasticsearch_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/etcd_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/etcd_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/hipchat_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/hipchat_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/kafka_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/kafka_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/local.py
 %%PYTHON_SITELIBDIR%%/salt/returners/local.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/local_cache.py
@@ -890,24 +1059,38 @@
 %%PYTHON_SITELIBDIR%%/salt/returners/mysql.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/odbc.py
 %%PYTHON_SITELIBDIR%%/salt/returners/odbc.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/pgjsonb.py
+%%PYTHON_SITELIBDIR%%/salt/returners/pgjsonb.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/postgres.py
 %%PYTHON_SITELIBDIR%%/salt/returners/postgres.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/postgres_local_cache.py
+%%PYTHON_SITELIBDIR%%/salt/returners/postgres_local_cache.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/sentry_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/sentry_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/slack_returner.py
+%%PYTHON_SITELIBDIR%%/salt/returners/slack_returner.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/sms_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/sms_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/smtp_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/smtp_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/sqlite3_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/sqlite3_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/syslog_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/syslog_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/xmpp_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/xmpp_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/roster/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/ansible.py
 %%PYTHON_SITELIBDIR%%/salt/roster/ansible.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/cache.py
 %%PYTHON_SITELIBDIR%%/salt/roster/cache.pyc
+%%PYTHON_SITELIBDIR%%/salt/roster/cloud.py
+%%PYTHON_SITELIBDIR%%/salt/roster/cloud.pyc
+%%PYTHON_SITELIBDIR%%/salt/roster/clustershell.py
+%%PYTHON_SITELIBDIR%%/salt/roster/clustershell.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/flat.py
 %%PYTHON_SITELIBDIR%%/salt/roster/flat.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/scan.py
@@ -922,12 +1105,18 @@
 %%PYTHON_SITELIBDIR%%/salt/runners/cloud.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/doc.py
 %%PYTHON_SITELIBDIR%%/salt/runners/doc.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/drac.py
+%%PYTHON_SITELIBDIR%%/salt/runners/drac.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/error.py
 %%PYTHON_SITELIBDIR%%/salt/runners/error.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/f5.py
+%%PYTHON_SITELIBDIR%%/salt/runners/f5.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/fileserver.py
 %%PYTHON_SITELIBDIR%%/salt/runners/fileserver.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/git_pillar.py
 %%PYTHON_SITELIBDIR%%/salt/runners/git_pillar.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/http.py
+%%PYTHON_SITELIBDIR%%/salt/runners/http.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/jobs.py
 %%PYTHON_SITELIBDIR%%/salt/runners/jobs.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/launchd.py
@@ -938,14 +1127,22 @@
 %%PYTHON_SITELIBDIR%%/salt/runners/manage.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/mine.py
 %%PYTHON_SITELIBDIR%%/salt/runners/mine.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/nacl.py
+%%PYTHON_SITELIBDIR%%/salt/runners/nacl.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/network.py
 %%PYTHON_SITELIBDIR%%/salt/runners/network.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/pagerduty.py
+%%PYTHON_SITELIBDIR%%/salt/runners/pagerduty.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/pillar.py
 %%PYTHON_SITELIBDIR%%/salt/runners/pillar.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/queue.py
 %%PYTHON_SITELIBDIR%%/salt/runners/queue.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/sdb.py
+%%PYTHON_SITELIBDIR%%/salt/runners/sdb.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/search.py
 %%PYTHON_SITELIBDIR%%/salt/runners/search.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/ssh.py
+%%PYTHON_SITELIBDIR%%/salt/runners/ssh.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/state.py
 %%PYTHON_SITELIBDIR%%/salt/runners/state.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/survey.py
@@ -962,8 +1159,14 @@
 %%PYTHON_SITELIBDIR%%/salt/scripts.pyc
 %%PYTHON_SITELIBDIR%%/salt/sdb/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/sdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/sdb/etcd_db.py
+%%PYTHON_SITELIBDIR%%/salt/sdb/etcd_db.pyc
 %%PYTHON_SITELIBDIR%%/salt/sdb/keyring_db.py
 %%PYTHON_SITELIBDIR%%/salt/sdb/keyring_db.pyc
+%%PYTHON_SITELIBDIR%%/salt/sdb/memcached.py
+%%PYTHON_SITELIBDIR%%/salt/sdb/memcached.pyc
+%%PYTHON_SITELIBDIR%%/salt/sdb/sqlite3.py
+%%PYTHON_SITELIBDIR%%/salt/sdb/sqlite3.pyc
 %%PYTHON_SITELIBDIR%%/salt/search/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/search/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/search/whoosh_search.py
@@ -984,6 +1187,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/apt.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/archive.py
 %%PYTHON_SITELIBDIR%%/salt/states/archive.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/artifactory.py
+%%PYTHON_SITELIBDIR%%/salt/states/artifactory.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/at.py
 %%PYTHON_SITELIBDIR%%/salt/states/at.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/augeas.py
@@ -996,6 +1201,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/boto_asg.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_cloudwatch_alarm.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_cloudwatch_alarm.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_dynamodb.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_dynamodb.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_elasticache.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_elasticache.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_elb.py
@@ -1008,6 +1215,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/boto_route53.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_secgroup.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_secgroup.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_sns.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_sns.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/chef.py
@@ -1020,6 +1229,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/composer.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/cron.py
 %%PYTHON_SITELIBDIR%%/salt/states/cron.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/cyg.py
+%%PYTHON_SITELIBDIR%%/salt/states/cyg.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ddns.py
 %%PYTHON_SITELIBDIR%%/salt/states/ddns.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/debconfmod.py
@@ -1028,6 +1239,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/disk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/dockerio.py
 %%PYTHON_SITELIBDIR%%/salt/states/dockerio.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/drac.py
+%%PYTHON_SITELIBDIR%%/salt/states/drac.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/environ.py
 %%PYTHON_SITELIBDIR%%/salt/states/environ.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/eselect.py
@@ -1044,16 +1257,22 @@
 %%PYTHON_SITELIBDIR%%/salt/states/glusterfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/gnomedesktop.py
 %%PYTHON_SITELIBDIR%%/salt/states/gnomedesktop.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/grafana.py
+%%PYTHON_SITELIBDIR%%/salt/states/grafana.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/grains.py
 %%PYTHON_SITELIBDIR%%/salt/states/grains.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/group.py
 %%PYTHON_SITELIBDIR%%/salt/states/group.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/hg.py
 %%PYTHON_SITELIBDIR%%/salt/states/hg.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/hipchat.py
+%%PYTHON_SITELIBDIR%%/salt/states/hipchat.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/host.py
 %%PYTHON_SITELIBDIR%%/salt/states/host.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/htpasswd.py
 %%PYTHON_SITELIBDIR%%/salt/states/htpasswd.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/http.py
+%%PYTHON_SITELIBDIR%%/salt/states/http.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/incron.py
 %%PYTHON_SITELIBDIR%%/salt/states/incron.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/influxdb_database.py
@@ -1062,10 +1281,14 @@
 %%PYTHON_SITELIBDIR%%/salt/states/influxdb_user.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ini_manage.py
 %%PYTHON_SITELIBDIR%%/salt/states/ini_manage.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/ipmi.py
+%%PYTHON_SITELIBDIR%%/salt/states/ipmi.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ipset.py
 %%PYTHON_SITELIBDIR%%/salt/states/ipset.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/iptables.py
 %%PYTHON_SITELIBDIR%%/salt/states/iptables.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/jboss7.py
+%%PYTHON_SITELIBDIR%%/salt/states/jboss7.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/keyboard.py
 %%PYTHON_SITELIBDIR%%/salt/states/keyboard.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/keystone.py
@@ -1076,6 +1299,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/layman.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/libvirt.py
 %%PYTHON_SITELIBDIR%%/salt/states/libvirt.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/linux_acl.py
+%%PYTHON_SITELIBDIR%%/salt/states/linux_acl.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/locale.py
 %%PYTHON_SITELIBDIR%%/salt/states/locale.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/lvm.py
@@ -1144,6 +1369,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_extension.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_group.py
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_group.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/postgres_schema.py
+%%PYTHON_SITELIBDIR%%/salt/states/postgres_schema.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_user.py
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_user.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/powerpath.py
@@ -1152,6 +1379,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/process.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pyenv.py
 %%PYTHON_SITELIBDIR%%/salt/states/pyenv.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/pyrax_queues.py
+%%PYTHON_SITELIBDIR%%/salt/states/pyrax_queues.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/quota.py
 %%PYTHON_SITELIBDIR%%/salt/states/quota.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/rabbitmq_cluster.py
@@ -1184,8 +1413,12 @@
 %%PYTHON_SITELIBDIR%%/salt/states/serverdensity_device.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/service.py
 %%PYTHON_SITELIBDIR%%/salt/states/service.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/slack.py
+%%PYTHON_SITELIBDIR%%/salt/states/slack.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/smtp.py
 %%PYTHON_SITELIBDIR%%/salt/states/smtp.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/splunk_search.py
+%%PYTHON_SITELIBDIR%%/salt/states/splunk_search.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_auth.py
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_auth.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_known_hosts.py
@@ -1200,14 +1433,22 @@
 %%PYTHON_SITELIBDIR%%/salt/states/svn.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/sysctl.py
 %%PYTHON_SITELIBDIR%%/salt/states/sysctl.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/syslog_ng.py
+%%PYTHON_SITELIBDIR%%/salt/states/syslog_ng.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/sysrc.py
+%%PYTHON_SITELIBDIR%%/salt/states/sysrc.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/test.py
 %%PYTHON_SITELIBDIR%%/salt/states/test.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/timezone.py
 %%PYTHON_SITELIBDIR%%/salt/states/timezone.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/tls.py
+%%PYTHON_SITELIBDIR%%/salt/states/tls.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/tomcat.py
 %%PYTHON_SITELIBDIR%%/salt/states/tomcat.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/user.py
 %%PYTHON_SITELIBDIR%%/salt/states/user.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/vbox_guest.py
+%%PYTHON_SITELIBDIR%%/salt/states/vbox_guest.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/virtualenv_mod.py
 %%PYTHON_SITELIBDIR%%/salt/states/virtualenv_mod.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/win_dns_client.py
@@ -1274,16 +1515,24 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/args.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/atomicfile.py
 %%PYTHON_SITELIBDIR%%/salt/utils/atomicfile.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/aws.py
+%%PYTHON_SITELIBDIR%%/salt/utils/aws.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/cache.py
 %%PYTHON_SITELIBDIR%%/salt/utils/cache.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/cloud.py
 %%PYTHON_SITELIBDIR%%/salt/utils/cloud.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/compat.py
+%%PYTHON_SITELIBDIR%%/salt/utils/compat.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/context.py
 %%PYTHON_SITELIBDIR%%/salt/utils/context.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/debug.py
 %%PYTHON_SITELIBDIR%%/salt/utils/debug.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/decorators/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/utils/decorators/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/dictdiffer.py
+%%PYTHON_SITELIBDIR%%/salt/utils/dictdiffer.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/dicttrim.py
+%%PYTHON_SITELIBDIR%%/salt/utils/dicttrim.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/dictupdate.py
 %%PYTHON_SITELIBDIR%%/salt/utils/dictupdate.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/doc.py
@@ -1304,18 +1553,28 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/github.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/gzip_util.py
 %%PYTHON_SITELIBDIR%%/salt/utils/gzip_util.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/http.py
+%%PYTHON_SITELIBDIR%%/salt/utils/http.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/iam.py
 %%PYTHON_SITELIBDIR%%/salt/utils/iam.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/immutabletypes.py
 %%PYTHON_SITELIBDIR%%/salt/utils/immutabletypes.pyc
-%%PYTHON_SITELIBDIR%%/salt/utils/ipaddr.py
-%%PYTHON_SITELIBDIR%%/salt/utils/ipaddr.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/jid.py
+%%PYTHON_SITELIBDIR%%/salt/utils/jid.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/jinja.py
 %%PYTHON_SITELIBDIR%%/salt/utils/jinja.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/job.py
+%%PYTHON_SITELIBDIR%%/salt/utils/job.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/kinds.py
+%%PYTHON_SITELIBDIR%%/salt/utils/kinds.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/lazy.py
+%%PYTHON_SITELIBDIR%%/salt/utils/lazy.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/mako.py
 %%PYTHON_SITELIBDIR%%/salt/utils/mako.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/master.py
 %%PYTHON_SITELIBDIR%%/salt/utils/master.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/memcached.py
+%%PYTHON_SITELIBDIR%%/salt/utils/memcached.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/migrations.py
 %%PYTHON_SITELIBDIR%%/salt/utils/migrations.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/minion.py
@@ -1330,8 +1589,16 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/odict.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/openstack/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/utils/openstack/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/neutron.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/neutron.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/openstack/nova.py
 %%PYTHON_SITELIBDIR%%/salt/utils/openstack/nova.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/pyrax/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/pyrax/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/pyrax/authenticate.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/pyrax/authenticate.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/pyrax/queues.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/pyrax/queues.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/openstack/swift.py
 %%PYTHON_SITELIBDIR%%/salt/utils/openstack/swift.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/pagerduty.py
@@ -1340,6 +1607,8 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/parsers.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/process.py
 %%PYTHON_SITELIBDIR%%/salt/utils/process.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/psutil_compat.py
+%%PYTHON_SITELIBDIR%%/salt/utils/psutil_compat.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/pycrypto.py
 %%PYTHON_SITELIBDIR%%/salt/utils/pycrypto.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/pydsl.py
@@ -1348,6 +1617,10 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/pyobjects.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/raetevent.py
 %%PYTHON_SITELIBDIR%%/salt/utils/raetevent.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/raetlane.py
+%%PYTHON_SITELIBDIR%%/salt/utils/raetlane.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/reactor.py
+%%PYTHON_SITELIBDIR%%/salt/utils/reactor.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/reclass.py
 %%PYTHON_SITELIBDIR%%/salt/utils/reclass.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/s3.py
@@ -1368,6 +1641,8 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/serializers/yaml.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/serializers/yamlex.py
 %%PYTHON_SITELIBDIR%%/salt/utils/serializers/yamlex.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/smb.py
+%%PYTHON_SITELIBDIR%%/salt/utils/smb.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/smtp.py
 %%PYTHON_SITELIBDIR%%/salt/utils/smtp.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/templates.py
@@ -1382,8 +1657,6 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/validate/net.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/validate/path.py
 %%PYTHON_SITELIBDIR%%/salt/utils/validate/path.pyc
-%%PYTHON_SITELIBDIR%%/salt/utils/validate/ssh.py
-%%PYTHON_SITELIBDIR%%/salt/utils/validate/ssh.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/validate/user.py
 %%PYTHON_SITELIBDIR%%/salt/utils/validate/user.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/verify.py
@@ -1402,8 +1675,12 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/xmlutil.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/yamldumper.py
 %%PYTHON_SITELIBDIR%%/salt/utils/yamldumper.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/yamlencoding.py
+%%PYTHON_SITELIBDIR%%/salt/utils/yamlencoding.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/yamlloader.py
 %%PYTHON_SITELIBDIR%%/salt/utils/yamlloader.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/zeromq.py
+%%PYTHON_SITELIBDIR%%/salt/utils/zeromq.pyc
 %%PYTHON_SITELIBDIR%%/salt/version.py
 %%PYTHON_SITELIBDIR%%/salt/version.pyc
 %%PYTHON_SITELIBDIR%%/salt/wheel/__init__.py
@@ -1416,6 +1693,8 @@
 %%PYTHON_SITELIBDIR%%/salt/wheel/file_roots.pyc
 %%PYTHON_SITELIBDIR%%/salt/wheel/key.py
 %%PYTHON_SITELIBDIR%%/salt/wheel/key.pyc
+%%PYTHON_SITELIBDIR%%/salt/wheel/minions.py
+%%PYTHON_SITELIBDIR%%/salt/wheel/minions.pyc
 %%PYTHON_SITELIBDIR%%/salt/wheel/pillar_roots.py
 %%PYTHON_SITELIBDIR%%/salt/wheel/pillar_roots.pyc
 @dir %%PYTHON_SITELIBDIR%%/salt