Update to 2017.7.0. Release notes:

https://docs.saltstack.com/en/latest/topics/releases/2017.7.0.html

The 2017.7 Salt Release adds initial Python 3 support.
The default Python version of Salt will remain Python 2.
Salt will no longer support Python 2.6.

4 files changed, 363 insertions, 23 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 85588356a0b..fcfada91249 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2017/07/05 11:02:16 sborrill Exp $
+# $NetBSD: Makefile,v 1.53 2017/08/01 12:09:57 sborrill Exp $
 
-DISTNAME=	salt-2016.11.6
+DISTNAME=	salt-2017.7.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/salt/}
 
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index 3ae7cf26c4a..f7353a89082 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2017/07/05 11:02:16 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.22 2017/08/01 12:09:57 sborrill Exp $
 bin/salt
 bin/salt-api
 bin/salt-call
@@ -98,6 +98,9 @@ ${PYSITELIB}/salt/beacons/journald.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/memusage.py
 ${PYSITELIB}/salt/beacons/memusage.pyc
 ${PYSITELIB}/salt/beacons/memusage.pyo
@@ -119,6 +122,9 @@ ${PYSITELIB}/salt/beacons/ps.pyo
 ${PYSITELIB}/salt/beacons/salt_proxy.py
 ${PYSITELIB}/salt/beacons/salt_proxy.pyc
 ${PYSITELIB}/salt/beacons/salt_proxy.pyo
+${PYSITELIB}/salt/beacons/sensehat.py
+${PYSITELIB}/salt/beacons/sensehat.pyc
+${PYSITELIB}/salt/beacons/sensehat.pyo
 ${PYSITELIB}/salt/beacons/service.py
 ${PYSITELIB}/salt/beacons/service.pyc
 ${PYSITELIB}/salt/beacons/service.pyo
@@ -128,6 +134,9 @@ ${PYSITELIB}/salt/beacons/sh.pyo
 ${PYSITELIB}/salt/beacons/status.py
 ${PYSITELIB}/salt/beacons/status.pyc
 ${PYSITELIB}/salt/beacons/status.pyo
+${PYSITELIB}/salt/beacons/telegram_bot_msg.py
+${PYSITELIB}/salt/beacons/telegram_bot_msg.pyc
+${PYSITELIB}/salt/beacons/telegram_bot_msg.pyo
 ${PYSITELIB}/salt/beacons/twilio_txt_msg.py
 ${PYSITELIB}/salt/beacons/twilio_txt_msg.pyc
 ${PYSITELIB}/salt/beacons/twilio_txt_msg.pyo
@@ -143,6 +152,9 @@ ${PYSITELIB}/salt/cache/consul.pyo
 ${PYSITELIB}/salt/cache/localfs.py
 ${PYSITELIB}/salt/cache/localfs.pyc
 ${PYSITELIB}/salt/cache/localfs.pyo
+${PYSITELIB}/salt/cache/redis_cache.py
+${PYSITELIB}/salt/cache/redis_cache.pyc
+${PYSITELIB}/salt/cache/redis_cache.pyo
 ${PYSITELIB}/salt/cli/__init__.py
 ${PYSITELIB}/salt/cli/__init__.pyc
 ${PYSITELIB}/salt/cli/__init__.pyo
@@ -269,6 +281,9 @@ ${PYSITELIB}/salt/cloud/clouds/gogrid.pyo
 ${PYSITELIB}/salt/cloud/clouds/joyent.py
 ${PYSITELIB}/salt/cloud/clouds/joyent.pyc
 ${PYSITELIB}/salt/cloud/clouds/joyent.pyo
+${PYSITELIB}/salt/cloud/clouds/libvirt.py
+${PYSITELIB}/salt/cloud/clouds/libvirt.pyc
+${PYSITELIB}/salt/cloud/clouds/libvirt.pyo
 ${PYSITELIB}/salt/cloud/clouds/linode.py
 ${PYSITELIB}/salt/cloud/clouds/linode.pyc
 ${PYSITELIB}/salt/cloud/clouds/linode.pyo
@@ -287,6 +302,9 @@ ${PYSITELIB}/salt/cloud/clouds/opennebula.pyo
 ${PYSITELIB}/salt/cloud/clouds/openstack.py
 ${PYSITELIB}/salt/cloud/clouds/openstack.pyc
 ${PYSITELIB}/salt/cloud/clouds/openstack.pyo
+${PYSITELIB}/salt/cloud/clouds/packet.py
+${PYSITELIB}/salt/cloud/clouds/packet.pyc
+${PYSITELIB}/salt/cloud/clouds/packet.pyo
 ${PYSITELIB}/salt/cloud/clouds/parallels.py
 ${PYSITELIB}/salt/cloud/clouds/parallels.pyc
 ${PYSITELIB}/salt/cloud/clouds/parallels.pyo
@@ -458,12 +476,21 @@ ${PYSITELIB}/salt/engines/hipchat.pyo
 ${PYSITELIB}/salt/engines/http_logstash.py
 ${PYSITELIB}/salt/engines/http_logstash.pyc
 ${PYSITELIB}/salt/engines/http_logstash.pyo
+${PYSITELIB}/salt/engines/ircbot.py
+${PYSITELIB}/salt/engines/ircbot.pyc
+${PYSITELIB}/salt/engines/ircbot.pyo
+${PYSITELIB}/salt/engines/junos_syslog.py
+${PYSITELIB}/salt/engines/junos_syslog.pyc
+${PYSITELIB}/salt/engines/junos_syslog.pyo
 ${PYSITELIB}/salt/engines/logentries.py
 ${PYSITELIB}/salt/engines/logentries.pyc
 ${PYSITELIB}/salt/engines/logentries.pyo
 ${PYSITELIB}/salt/engines/logstash.py
 ${PYSITELIB}/salt/engines/logstash.pyc
 ${PYSITELIB}/salt/engines/logstash.pyo
+${PYSITELIB}/salt/engines/napalm_syslog.py
+${PYSITELIB}/salt/engines/napalm_syslog.pyc
+${PYSITELIB}/salt/engines/napalm_syslog.pyo
 ${PYSITELIB}/salt/engines/reactor.py
 ${PYSITELIB}/salt/engines/reactor.pyc
 ${PYSITELIB}/salt/engines/reactor.pyo
@@ -476,12 +503,18 @@ ${PYSITELIB}/salt/engines/slack.pyo
 ${PYSITELIB}/salt/engines/sqs_events.py
 ${PYSITELIB}/salt/engines/sqs_events.pyc
 ${PYSITELIB}/salt/engines/sqs_events.pyo
+${PYSITELIB}/salt/engines/stalekey.py
+${PYSITELIB}/salt/engines/stalekey.pyc
+${PYSITELIB}/salt/engines/stalekey.pyo
 ${PYSITELIB}/salt/engines/test.py
 ${PYSITELIB}/salt/engines/test.pyc
 ${PYSITELIB}/salt/engines/test.pyo
 ${PYSITELIB}/salt/engines/thorium.py
 ${PYSITELIB}/salt/engines/thorium.pyc
 ${PYSITELIB}/salt/engines/thorium.pyo
+${PYSITELIB}/salt/engines/webhook.py
+${PYSITELIB}/salt/engines/webhook.pyc
+${PYSITELIB}/salt/engines/webhook.pyo
 ${PYSITELIB}/salt/exceptions.py
 ${PYSITELIB}/salt/exceptions.pyc
 ${PYSITELIB}/salt/exceptions.pyo
@@ -569,6 +602,9 @@ ${PYSITELIB}/salt/grains/marathon.pyo
 ${PYSITELIB}/salt/grains/mdadm.py
 ${PYSITELIB}/salt/grains/mdadm.pyc
 ${PYSITELIB}/salt/grains/mdadm.pyo
+${PYSITELIB}/salt/grains/metadata.py
+${PYSITELIB}/salt/grains/metadata.pyc
+${PYSITELIB}/salt/grains/metadata.pyo
 ${PYSITELIB}/salt/grains/minion_process.py
 ${PYSITELIB}/salt/grains/minion_process.pyc
 ${PYSITELIB}/salt/grains/minion_process.pyo
@@ -650,6 +686,9 @@ ${PYSITELIB}/salt/modules/apcups.pyo
 ${PYSITELIB}/salt/modules/apf.py
 ${PYSITELIB}/salt/modules/apf.pyc
 ${PYSITELIB}/salt/modules/apf.pyo
+${PYSITELIB}/salt/modules/apk.py
+${PYSITELIB}/salt/modules/apk.pyc
+${PYSITELIB}/salt/modules/apk.pyo
 ${PYSITELIB}/salt/modules/aptpkg.py
 ${PYSITELIB}/salt/modules/aptpkg.pyc
 ${PYSITELIB}/salt/modules/aptpkg.pyo
@@ -662,6 +701,9 @@ ${PYSITELIB}/salt/modules/artifactory.pyo
 ${PYSITELIB}/salt/modules/at.py
 ${PYSITELIB}/salt/modules/at.pyc
 ${PYSITELIB}/salt/modules/at.pyo
+${PYSITELIB}/salt/modules/at_solaris.py
+${PYSITELIB}/salt/modules/at_solaris.pyc
+${PYSITELIB}/salt/modules/at_solaris.pyo
 ${PYSITELIB}/salt/modules/augeas_cfg.py
 ${PYSITELIB}/salt/modules/augeas_cfg.pyc
 ${PYSITELIB}/salt/modules/augeas_cfg.pyo
@@ -686,6 +728,12 @@ ${PYSITELIB}/salt/modules/blockdev.pyo
 ${PYSITELIB}/salt/modules/bluez.py
 ${PYSITELIB}/salt/modules/bluez.pyc
 ${PYSITELIB}/salt/modules/bluez.pyo
+${PYSITELIB}/salt/modules/boto3_elasticache.py
+${PYSITELIB}/salt/modules/boto3_elasticache.pyc
+${PYSITELIB}/salt/modules/boto3_elasticache.pyo
+${PYSITELIB}/salt/modules/boto3_route53.py
+${PYSITELIB}/salt/modules/boto3_route53.pyc
+${PYSITELIB}/salt/modules/boto3_route53.pyo
 ${PYSITELIB}/salt/modules/boto_apigateway.py
 ${PYSITELIB}/salt/modules/boto_apigateway.pyc
 ${PYSITELIB}/salt/modules/boto_apigateway.pyo
@@ -716,6 +764,9 @@ ${PYSITELIB}/salt/modules/boto_dynamodb.pyo
 ${PYSITELIB}/salt/modules/boto_ec2.py
 ${PYSITELIB}/salt/modules/boto_ec2.pyc
 ${PYSITELIB}/salt/modules/boto_ec2.pyo
+${PYSITELIB}/salt/modules/boto_efs.py
+${PYSITELIB}/salt/modules/boto_efs.pyc
+${PYSITELIB}/salt/modules/boto_efs.pyo
 ${PYSITELIB}/salt/modules/boto_elasticache.py
 ${PYSITELIB}/salt/modules/boto_elasticache.pyc
 ${PYSITELIB}/salt/modules/boto_elasticache.pyo
@@ -725,12 +776,18 @@ ${PYSITELIB}/salt/modules/boto_elasticsearch_domain.pyo
 ${PYSITELIB}/salt/modules/boto_elb.py
 ${PYSITELIB}/salt/modules/boto_elb.pyc
 ${PYSITELIB}/salt/modules/boto_elb.pyo
+${PYSITELIB}/salt/modules/boto_elbv2.py
+${PYSITELIB}/salt/modules/boto_elbv2.pyc
+${PYSITELIB}/salt/modules/boto_elbv2.pyo
 ${PYSITELIB}/salt/modules/boto_iam.py
 ${PYSITELIB}/salt/modules/boto_iam.pyc
 ${PYSITELIB}/salt/modules/boto_iam.pyo
 ${PYSITELIB}/salt/modules/boto_iot.py
 ${PYSITELIB}/salt/modules/boto_iot.pyc
 ${PYSITELIB}/salt/modules/boto_iot.pyo
+${PYSITELIB}/salt/modules/boto_kinesis.py
+${PYSITELIB}/salt/modules/boto_kinesis.pyc
+${PYSITELIB}/salt/modules/boto_kinesis.pyo
 ${PYSITELIB}/salt/modules/boto_kms.py
 ${PYSITELIB}/salt/modules/boto_kms.pyc
 ${PYSITELIB}/salt/modules/boto_kms.pyo
@@ -773,6 +830,9 @@ ${PYSITELIB}/salt/modules/btrfs.pyo
 ${PYSITELIB}/salt/modules/cabal.py
 ${PYSITELIB}/salt/modules/cabal.pyc
 ${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
@@ -884,12 +944,9 @@ ${PYSITELIB}/salt/modules/dnsutil.pyo
 ${PYSITELIB}/salt/modules/dockercompose.py
 ${PYSITELIB}/salt/modules/dockercompose.pyc
 ${PYSITELIB}/salt/modules/dockercompose.pyo
-${PYSITELIB}/salt/modules/dockerio.py
-${PYSITELIB}/salt/modules/dockerio.pyc
-${PYSITELIB}/salt/modules/dockerio.pyo
-${PYSITELIB}/salt/modules/dockerng.py
-${PYSITELIB}/salt/modules/dockerng.pyc
-${PYSITELIB}/salt/modules/dockerng.pyo
+${PYSITELIB}/salt/modules/dockermod.py
+${PYSITELIB}/salt/modules/dockermod.pyc
+${PYSITELIB}/salt/modules/dockermod.pyo
 ${PYSITELIB}/salt/modules/dpkg.py
 ${PYSITELIB}/salt/modules/dpkg.pyc
 ${PYSITELIB}/salt/modules/dpkg.pyo
@@ -947,6 +1004,9 @@ ${PYSITELIB}/salt/modules/firewalld.pyo
 ${PYSITELIB}/salt/modules/freebsd_sysctl.py
 ${PYSITELIB}/salt/modules/freebsd_sysctl.pyc
 ${PYSITELIB}/salt/modules/freebsd_sysctl.pyo
+${PYSITELIB}/salt/modules/freebsd_update.py
+${PYSITELIB}/salt/modules/freebsd_update.pyc
+${PYSITELIB}/salt/modules/freebsd_update.pyo
 ${PYSITELIB}/salt/modules/freebsdjail.py
 ${PYSITELIB}/salt/modules/freebsdjail.pyc
 ${PYSITELIB}/salt/modules/freebsdjail.pyo
@@ -992,6 +1052,9 @@ ${PYSITELIB}/salt/modules/gnomedesktop.pyo
 ${PYSITELIB}/salt/modules/gpg.py
 ${PYSITELIB}/salt/modules/gpg.pyc
 ${PYSITELIB}/salt/modules/gpg.pyo
+${PYSITELIB}/salt/modules/grafana4.py
+${PYSITELIB}/salt/modules/grafana4.pyc
+${PYSITELIB}/salt/modules/grafana4.pyo
 ${PYSITELIB}/salt/modules/grains.py
 ${PYSITELIB}/salt/modules/grains.pyc
 ${PYSITELIB}/salt/modules/grains.pyo
@@ -1013,6 +1076,9 @@ ${PYSITELIB}/salt/modules/haproxyconn.pyo
 ${PYSITELIB}/salt/modules/hashutil.py
 ${PYSITELIB}/salt/modules/hashutil.pyc
 ${PYSITELIB}/salt/modules/hashutil.pyo
+${PYSITELIB}/salt/modules/heat.py
+${PYSITELIB}/salt/modules/heat.pyc
+${PYSITELIB}/salt/modules/heat.pyo
 ${PYSITELIB}/salt/modules/hg.py
 ${PYSITELIB}/salt/modules/hg.pyc
 ${PYSITELIB}/salt/modules/hg.pyo
@@ -1028,15 +1094,15 @@ ${PYSITELIB}/salt/modules/htpasswd.pyo
 ${PYSITELIB}/salt/modules/http.py
 ${PYSITELIB}/salt/modules/http.pyc
 ${PYSITELIB}/salt/modules/http.pyo
+${PYSITELIB}/salt/modules/icinga2.py
+${PYSITELIB}/salt/modules/icinga2.pyc
+${PYSITELIB}/salt/modules/icinga2.pyo
 ${PYSITELIB}/salt/modules/ifttt.py
 ${PYSITELIB}/salt/modules/ifttt.pyc
 ${PYSITELIB}/salt/modules/ifttt.pyo
 ${PYSITELIB}/salt/modules/ilo.py
 ${PYSITELIB}/salt/modules/ilo.pyc
 ${PYSITELIB}/salt/modules/ilo.pyo
-${PYSITELIB}/salt/modules/img.py
-${PYSITELIB}/salt/modules/img.pyc
-${PYSITELIB}/salt/modules/img.pyo
 ${PYSITELIB}/salt/modules/incron.py
 ${PYSITELIB}/salt/modules/incron.pyc
 ${PYSITELIB}/salt/modules/incron.pyo
@@ -1127,6 +1193,9 @@ ${PYSITELIB}/salt/modules/keystone.pyo
 ${PYSITELIB}/salt/modules/kmod.py
 ${PYSITELIB}/salt/modules/kmod.pyc
 ${PYSITELIB}/salt/modules/kmod.pyo
+${PYSITELIB}/salt/modules/kubernetes.py
+${PYSITELIB}/salt/modules/kubernetes.pyc
+${PYSITELIB}/salt/modules/kubernetes.pyo
 ${PYSITELIB}/salt/modules/launchctl.py
 ${PYSITELIB}/salt/modules/launchctl.pyc
 ${PYSITELIB}/salt/modules/launchctl.pyo
@@ -1163,6 +1232,9 @@ ${PYSITELIB}/salt/modules/locate.pyo
 ${PYSITELIB}/salt/modules/logadm.py
 ${PYSITELIB}/salt/modules/logadm.pyc
 ${PYSITELIB}/salt/modules/logadm.pyo
+${PYSITELIB}/salt/modules/logmod.py
+${PYSITELIB}/salt/modules/logmod.pyc
+${PYSITELIB}/salt/modules/logmod.pyo
 ${PYSITELIB}/salt/modules/logrotate.py
 ${PYSITELIB}/salt/modules/logrotate.pyc
 ${PYSITELIB}/salt/modules/logrotate.pyo
@@ -1235,6 +1307,9 @@ ${PYSITELIB}/salt/modules/marathon.pyo
 ${PYSITELIB}/salt/modules/match.py
 ${PYSITELIB}/salt/modules/match.pyc
 ${PYSITELIB}/salt/modules/match.pyo
+${PYSITELIB}/salt/modules/mattermost.py
+${PYSITELIB}/salt/modules/mattermost.pyc
+${PYSITELIB}/salt/modules/mattermost.pyo
 ${PYSITELIB}/salt/modules/mdadm.py
 ${PYSITELIB}/salt/modules/mdadm.pyc
 ${PYSITELIB}/salt/modules/mdadm.pyo
@@ -1271,6 +1346,9 @@ ${PYSITELIB}/salt/modules/mount.pyo
 ${PYSITELIB}/salt/modules/mssql.py
 ${PYSITELIB}/salt/modules/mssql.pyc
 ${PYSITELIB}/salt/modules/mssql.pyo
+${PYSITELIB}/salt/modules/msteams.py
+${PYSITELIB}/salt/modules/msteams.pyc
+${PYSITELIB}/salt/modules/msteams.pyo
 ${PYSITELIB}/salt/modules/munin.py
 ${PYSITELIB}/salt/modules/munin.pyc
 ${PYSITELIB}/salt/modules/munin.pyo
@@ -1286,6 +1364,27 @@ ${PYSITELIB}/salt/modules/nagios.pyo
 ${PYSITELIB}/salt/modules/nagios_rpc.py
 ${PYSITELIB}/salt/modules/nagios_rpc.pyc
 ${PYSITELIB}/salt/modules/nagios_rpc.pyo
+${PYSITELIB}/salt/modules/namecheap_dns.py
+${PYSITELIB}/salt/modules/namecheap_dns.pyc
+${PYSITELIB}/salt/modules/namecheap_dns.pyo
+${PYSITELIB}/salt/modules/namecheap_domains.py
+${PYSITELIB}/salt/modules/namecheap_domains.pyc
+${PYSITELIB}/salt/modules/namecheap_domains.pyo
+${PYSITELIB}/salt/modules/namecheap_ns.py
+${PYSITELIB}/salt/modules/namecheap_ns.pyc
+${PYSITELIB}/salt/modules/namecheap_ns.pyo
+${PYSITELIB}/salt/modules/namecheap_ssl.py
+${PYSITELIB}/salt/modules/namecheap_ssl.pyc
+${PYSITELIB}/salt/modules/namecheap_ssl.pyo
+${PYSITELIB}/salt/modules/namecheap_users.py
+${PYSITELIB}/salt/modules/namecheap_users.pyc
+${PYSITELIB}/salt/modules/namecheap_users.pyo
+${PYSITELIB}/salt/modules/napalm.py
+${PYSITELIB}/salt/modules/napalm.pyc
+${PYSITELIB}/salt/modules/napalm.pyo
+${PYSITELIB}/salt/modules/napalm_acl.py
+${PYSITELIB}/salt/modules/napalm_acl.pyc
+${PYSITELIB}/salt/modules/napalm_acl.pyo
 ${PYSITELIB}/salt/modules/napalm_bgp.py
 ${PYSITELIB}/salt/modules/napalm_bgp.pyc
 ${PYSITELIB}/salt/modules/napalm_bgp.pyo
@@ -1307,6 +1406,9 @@ ${PYSITELIB}/salt/modules/napalm_snmp.pyo
 ${PYSITELIB}/salt/modules/napalm_users.py
 ${PYSITELIB}/salt/modules/napalm_users.pyc
 ${PYSITELIB}/salt/modules/napalm_users.pyo
+${PYSITELIB}/salt/modules/napalm_yang_mod.py
+${PYSITELIB}/salt/modules/napalm_yang_mod.pyc
+${PYSITELIB}/salt/modules/napalm_yang_mod.pyo
 ${PYSITELIB}/salt/modules/netaddress.py
 ${PYSITELIB}/salt/modules/netaddress.pyc
 ${PYSITELIB}/salt/modules/netaddress.pyo
@@ -1334,6 +1436,12 @@ ${PYSITELIB}/salt/modules/nftables.pyo
 ${PYSITELIB}/salt/modules/nginx.py
 ${PYSITELIB}/salt/modules/nginx.pyc
 ${PYSITELIB}/salt/modules/nginx.pyo
+${PYSITELIB}/salt/modules/nilrt_ip.py
+${PYSITELIB}/salt/modules/nilrt_ip.pyc
+${PYSITELIB}/salt/modules/nilrt_ip.pyo
+${PYSITELIB}/salt/modules/nix.py
+${PYSITELIB}/salt/modules/nix.pyc
+${PYSITELIB}/salt/modules/nix.pyo
 ${PYSITELIB}/salt/modules/nova.py
 ${PYSITELIB}/salt/modules/nova.pyc
 ${PYSITELIB}/salt/modules/nova.pyo
@@ -1403,6 +1511,9 @@ ${PYSITELIB}/salt/modules/parted.pyo
 ${PYSITELIB}/salt/modules/pcs.py
 ${PYSITELIB}/salt/modules/pcs.pyc
 ${PYSITELIB}/salt/modules/pcs.pyo
+${PYSITELIB}/salt/modules/pdbedit.py
+${PYSITELIB}/salt/modules/pdbedit.pyc
+${PYSITELIB}/salt/modules/pdbedit.pyo
 ${PYSITELIB}/salt/modules/pecl.py
 ${PYSITELIB}/salt/modules/pecl.pyc
 ${PYSITELIB}/salt/modules/pecl.pyo
@@ -1490,6 +1601,9 @@ ${PYSITELIB}/salt/modules/rallydev.pyo
 ${PYSITELIB}/salt/modules/random_org.py
 ${PYSITELIB}/salt/modules/random_org.pyc
 ${PYSITELIB}/salt/modules/random_org.pyo
+${PYSITELIB}/salt/modules/rbac_solaris.py
+${PYSITELIB}/salt/modules/rbac_solaris.pyc
+${PYSITELIB}/salt/modules/rbac_solaris.pyo
 ${PYSITELIB}/salt/modules/rbenv.py
 ${PYSITELIB}/salt/modules/rbenv.pyc
 ${PYSITELIB}/salt/modules/rbenv.pyo
@@ -1571,6 +1685,9 @@ ${PYSITELIB}/salt/modules/seed.pyo
 ${PYSITELIB}/salt/modules/selinux.py
 ${PYSITELIB}/salt/modules/selinux.pyc
 ${PYSITELIB}/salt/modules/selinux.pyo
+${PYSITELIB}/salt/modules/sensehat.py
+${PYSITELIB}/salt/modules/sensehat.pyc
+${PYSITELIB}/salt/modules/sensehat.pyo
 ${PYSITELIB}/salt/modules/sensors.py
 ${PYSITELIB}/salt/modules/sensors.pyc
 ${PYSITELIB}/salt/modules/sensors.pyo
@@ -1640,6 +1757,9 @@ ${PYSITELIB}/salt/modules/solarispkg.pyo
 ${PYSITELIB}/salt/modules/solr.py
 ${PYSITELIB}/salt/modules/solr.pyc
 ${PYSITELIB}/salt/modules/solr.pyo
+${PYSITELIB}/salt/modules/solrcloud.py
+${PYSITELIB}/salt/modules/solrcloud.pyc
+${PYSITELIB}/salt/modules/solrcloud.pyo
 ${PYSITELIB}/salt/modules/splunk.py
 ${PYSITELIB}/salt/modules/splunk.pyc
 ${PYSITELIB}/salt/modules/splunk.pyo
@@ -1664,12 +1784,18 @@ ${PYSITELIB}/salt/modules/state.pyo
 ${PYSITELIB}/salt/modules/status.py
 ${PYSITELIB}/salt/modules/status.pyc
 ${PYSITELIB}/salt/modules/status.pyo
+${PYSITELIB}/salt/modules/statuspage.py
+${PYSITELIB}/salt/modules/statuspage.pyc
+${PYSITELIB}/salt/modules/statuspage.pyo
 ${PYSITELIB}/salt/modules/stormpath.py
 ${PYSITELIB}/salt/modules/stormpath.pyc
 ${PYSITELIB}/salt/modules/stormpath.pyo
 ${PYSITELIB}/salt/modules/supervisord.py
 ${PYSITELIB}/salt/modules/supervisord.pyc
 ${PYSITELIB}/salt/modules/supervisord.pyo
+${PYSITELIB}/salt/modules/suse_apache.py
+${PYSITELIB}/salt/modules/suse_apache.pyc
+${PYSITELIB}/salt/modules/suse_apache.pyo
 ${PYSITELIB}/salt/modules/svn.py
 ${PYSITELIB}/salt/modules/svn.pyc
 ${PYSITELIB}/salt/modules/svn.pyo
@@ -1727,6 +1853,9 @@ ${PYSITELIB}/salt/modules/tomcat.pyo
 ${PYSITELIB}/salt/modules/trafficserver.py
 ${PYSITELIB}/salt/modules/trafficserver.pyc
 ${PYSITELIB}/salt/modules/trafficserver.pyo
+${PYSITELIB}/salt/modules/travisci.py
+${PYSITELIB}/salt/modules/travisci.pyc
+${PYSITELIB}/salt/modules/travisci.pyo
 ${PYSITELIB}/salt/modules/tuned.py
 ${PYSITELIB}/salt/modules/tuned.pyc
 ${PYSITELIB}/salt/modules/tuned.pyo
@@ -1751,6 +1880,9 @@ ${PYSITELIB}/salt/modules/uwsgi.pyo
 ${PYSITELIB}/salt/modules/varnish.py
 ${PYSITELIB}/salt/modules/varnish.pyc
 ${PYSITELIB}/salt/modules/varnish.pyo
+${PYSITELIB}/salt/modules/vault.py
+${PYSITELIB}/salt/modules/vault.pyc
+${PYSITELIB}/salt/modules/vault.pyo
 ${PYSITELIB}/salt/modules/vbox_guest.py
 ${PYSITELIB}/salt/modules/vbox_guest.pyc
 ${PYSITELIB}/salt/modules/vbox_guest.pyo
@@ -1907,6 +2039,12 @@ ${PYSITELIB}/salt/modules/zk_concurrency.pyo
 ${PYSITELIB}/salt/modules/znc.py
 ${PYSITELIB}/salt/modules/znc.pyc
 ${PYSITELIB}/salt/modules/znc.pyo
+${PYSITELIB}/salt/modules/zoneadm.py
+${PYSITELIB}/salt/modules/zoneadm.pyc
+${PYSITELIB}/salt/modules/zoneadm.pyo
+${PYSITELIB}/salt/modules/zonecfg.py
+${PYSITELIB}/salt/modules/zonecfg.pyc
+${PYSITELIB}/salt/modules/zonecfg.pyo
 ${PYSITELIB}/salt/modules/zpool.py
 ${PYSITELIB}/salt/modules/zpool.pyc
 ${PYSITELIB}/salt/modules/zpool.pyo
@@ -1988,6 +2126,9 @@ ${PYSITELIB}/salt/output/progress.pyo
 ${PYSITELIB}/salt/output/raw.py
 ${PYSITELIB}/salt/output/raw.pyc
 ${PYSITELIB}/salt/output/raw.pyo
+${PYSITELIB}/salt/output/table_out.py
+${PYSITELIB}/salt/output/table_out.pyc
+${PYSITELIB}/salt/output/table_out.pyo
 ${PYSITELIB}/salt/output/txt.py
 ${PYSITELIB}/salt/output/txt.pyc
 ${PYSITELIB}/salt/output/txt.pyo
@@ -2024,6 +2165,9 @@ ${PYSITELIB}/salt/pillar/consul_pillar.pyo
 ${PYSITELIB}/salt/pillar/csvpillar.py
 ${PYSITELIB}/salt/pillar/csvpillar.pyc
 ${PYSITELIB}/salt/pillar/csvpillar.pyo
+${PYSITELIB}/salt/pillar/digicert.py
+${PYSITELIB}/salt/pillar/digicert.pyc
+${PYSITELIB}/salt/pillar/digicert.pyo
 ${PYSITELIB}/salt/pillar/django_orm.py
 ${PYSITELIB}/salt/pillar/django_orm.pyc
 ${PYSITELIB}/salt/pillar/django_orm.pyo
@@ -2042,6 +2186,9 @@ ${PYSITELIB}/salt/pillar/foreman.pyo
 ${PYSITELIB}/salt/pillar/git_pillar.py
 ${PYSITELIB}/salt/pillar/git_pillar.pyc
 ${PYSITELIB}/salt/pillar/git_pillar.pyo
+${PYSITELIB}/salt/pillar/gpg.py
+${PYSITELIB}/salt/pillar/gpg.pyc
+${PYSITELIB}/salt/pillar/gpg.pyo
 ${PYSITELIB}/salt/pillar/hg_pillar.py
 ${PYSITELIB}/salt/pillar/hg_pillar.pyc
 ${PYSITELIB}/salt/pillar/hg_pillar.pyo
@@ -2078,6 +2225,9 @@ ${PYSITELIB}/salt/pillar/pepa.pyo
 ${PYSITELIB}/salt/pillar/pillar_ldap.py
 ${PYSITELIB}/salt/pillar/pillar_ldap.pyc
 ${PYSITELIB}/salt/pillar/pillar_ldap.pyo
+${PYSITELIB}/salt/pillar/postgres.py
+${PYSITELIB}/salt/pillar/postgres.pyc
+${PYSITELIB}/salt/pillar/postgres.pyo
 ${PYSITELIB}/salt/pillar/puppet.py
 ${PYSITELIB}/salt/pillar/puppet.pyc
 ${PYSITELIB}/salt/pillar/puppet.pyo
@@ -2111,9 +2261,15 @@ ${PYSITELIB}/salt/pillar/varstack_pillar.pyo
 ${PYSITELIB}/salt/pillar/vault.py
 ${PYSITELIB}/salt/pillar/vault.pyc
 ${PYSITELIB}/salt/pillar/vault.pyo
+${PYSITELIB}/salt/pillar/venafi.py
+${PYSITELIB}/salt/pillar/venafi.pyc
+${PYSITELIB}/salt/pillar/venafi.pyo
 ${PYSITELIB}/salt/pillar/virtkey.py
 ${PYSITELIB}/salt/pillar/virtkey.pyc
 ${PYSITELIB}/salt/pillar/virtkey.pyo
+${PYSITELIB}/salt/pillar/vmware_pillar.py
+${PYSITELIB}/salt/pillar/vmware_pillar.pyc
+${PYSITELIB}/salt/pillar/vmware_pillar.pyo
 ${PYSITELIB}/salt/proxy/__init__.py
 ${PYSITELIB}/salt/proxy/__init__.pyc
 ${PYSITELIB}/salt/proxy/__init__.pyo
@@ -2195,6 +2351,9 @@ ${PYSITELIB}/salt/renderers/mako.pyo
 ${PYSITELIB}/salt/renderers/msgpack.py
 ${PYSITELIB}/salt/renderers/msgpack.pyc
 ${PYSITELIB}/salt/renderers/msgpack.pyo
+${PYSITELIB}/salt/renderers/pass.py
+${PYSITELIB}/salt/renderers/pass.pyc
+${PYSITELIB}/salt/renderers/pass.pyo
 ${PYSITELIB}/salt/renderers/py.py
 ${PYSITELIB}/salt/renderers/py.pyc
 ${PYSITELIB}/salt/renderers/py.pyo
@@ -2243,6 +2402,9 @@ ${PYSITELIB}/salt/returners/elasticsearch_return.pyo
 ${PYSITELIB}/salt/returners/etcd_return.py
 ${PYSITELIB}/salt/returners/etcd_return.pyc
 ${PYSITELIB}/salt/returners/etcd_return.pyo
+${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
@@ -2252,12 +2414,18 @@ ${PYSITELIB}/salt/returners/influxdb_return.pyo
 ${PYSITELIB}/salt/returners/kafka_return.py
 ${PYSITELIB}/salt/returners/kafka_return.pyc
 ${PYSITELIB}/salt/returners/kafka_return.pyo
+${PYSITELIB}/salt/returners/librato_return.py
+${PYSITELIB}/salt/returners/librato_return.pyc
+${PYSITELIB}/salt/returners/librato_return.pyo
 ${PYSITELIB}/salt/returners/local.py
 ${PYSITELIB}/salt/returners/local.pyc
 ${PYSITELIB}/salt/returners/local.pyo
 ${PYSITELIB}/salt/returners/local_cache.py
 ${PYSITELIB}/salt/returners/local_cache.pyc
 ${PYSITELIB}/salt/returners/local_cache.pyo
+${PYSITELIB}/salt/returners/mattermost_returner.py
+${PYSITELIB}/salt/returners/mattermost_returner.pyc
+${PYSITELIB}/salt/returners/mattermost_returner.pyo
 ${PYSITELIB}/salt/returners/memcache_return.py
 ${PYSITELIB}/salt/returners/memcache_return.pyc
 ${PYSITELIB}/salt/returners/memcache_return.pyo
@@ -2360,6 +2528,9 @@ ${PYSITELIB}/salt/runners/asam.pyo
 ${PYSITELIB}/salt/runners/auth.py
 ${PYSITELIB}/salt/runners/auth.pyc
 ${PYSITELIB}/salt/runners/auth.pyo
+${PYSITELIB}/salt/runners/bgp.py
+${PYSITELIB}/salt/runners/bgp.pyc
+${PYSITELIB}/salt/runners/bgp.pyo
 ${PYSITELIB}/salt/runners/cache.py
 ${PYSITELIB}/salt/runners/cache.pyc
 ${PYSITELIB}/salt/runners/cache.pyo
@@ -2369,6 +2540,9 @@ ${PYSITELIB}/salt/runners/cloud.pyo
 ${PYSITELIB}/salt/runners/ddns.py
 ${PYSITELIB}/salt/runners/ddns.pyc
 ${PYSITELIB}/salt/runners/ddns.pyo
+${PYSITELIB}/salt/runners/digicertapi.py
+${PYSITELIB}/salt/runners/digicertapi.pyc
+${PYSITELIB}/salt/runners/digicertapi.pyo
 ${PYSITELIB}/salt/runners/doc.py
 ${PYSITELIB}/salt/runners/doc.pyc
 ${PYSITELIB}/salt/runners/doc.pyo
@@ -2405,12 +2579,18 @@ ${PYSITELIB}/salt/runners/lxc.pyo
 ${PYSITELIB}/salt/runners/manage.py
 ${PYSITELIB}/salt/runners/manage.pyc
 ${PYSITELIB}/salt/runners/manage.pyo
+${PYSITELIB}/salt/runners/mattermost.py
+${PYSITELIB}/salt/runners/mattermost.pyc
+${PYSITELIB}/salt/runners/mattermost.pyo
 ${PYSITELIB}/salt/runners/mine.py
 ${PYSITELIB}/salt/runners/mine.pyc
 ${PYSITELIB}/salt/runners/mine.pyo
 ${PYSITELIB}/salt/runners/nacl.py
 ${PYSITELIB}/salt/runners/nacl.pyc
 ${PYSITELIB}/salt/runners/nacl.pyo
+${PYSITELIB}/salt/runners/net.py
+${PYSITELIB}/salt/runners/net.pyc
+${PYSITELIB}/salt/runners/net.pyo
 ${PYSITELIB}/salt/runners/network.py
 ${PYSITELIB}/salt/runners/network.pyc
 ${PYSITELIB}/salt/runners/network.pyo
@@ -2462,6 +2642,12 @@ ${PYSITELIB}/salt/runners/test.pyo
 ${PYSITELIB}/salt/runners/thin.py
 ${PYSITELIB}/salt/runners/thin.pyc
 ${PYSITELIB}/salt/runners/thin.pyo
+${PYSITELIB}/salt/runners/vault.py
+${PYSITELIB}/salt/runners/vault.pyc
+${PYSITELIB}/salt/runners/vault.pyo
+${PYSITELIB}/salt/runners/venafiapi.py
+${PYSITELIB}/salt/runners/venafiapi.pyc
+${PYSITELIB}/salt/runners/venafiapi.pyo
 ${PYSITELIB}/salt/runners/virt.py
 ${PYSITELIB}/salt/runners/virt.pyc
 ${PYSITELIB}/salt/runners/virt.pyo
@@ -2477,6 +2663,9 @@ ${PYSITELIB}/salt/scripts.pyo
 ${PYSITELIB}/salt/sdb/__init__.py
 ${PYSITELIB}/salt/sdb/__init__.pyc
 ${PYSITELIB}/salt/sdb/__init__.pyo
+${PYSITELIB}/salt/sdb/cache.py
+${PYSITELIB}/salt/sdb/cache.pyc
+${PYSITELIB}/salt/sdb/cache.pyo
 ${PYSITELIB}/salt/sdb/confidant.py
 ${PYSITELIB}/salt/sdb/confidant.pyc
 ${PYSITELIB}/salt/sdb/confidant.pyo
@@ -2504,9 +2693,15 @@ ${PYSITELIB}/salt/sdb/rest.pyo
 ${PYSITELIB}/salt/sdb/sqlite3.py
 ${PYSITELIB}/salt/sdb/sqlite3.pyc
 ${PYSITELIB}/salt/sdb/sqlite3.pyo
+${PYSITELIB}/salt/sdb/tism.py
+${PYSITELIB}/salt/sdb/tism.pyc
+${PYSITELIB}/salt/sdb/tism.pyo
 ${PYSITELIB}/salt/sdb/vault.py
 ${PYSITELIB}/salt/sdb/vault.pyc
 ${PYSITELIB}/salt/sdb/vault.pyo
+${PYSITELIB}/salt/sdb/yaml.py
+${PYSITELIB}/salt/sdb/yaml.pyc
+${PYSITELIB}/salt/sdb/yaml.pyo
 ${PYSITELIB}/salt/search/__init__.py
 ${PYSITELIB}/salt/search/__init__.pyc
 ${PYSITELIB}/salt/search/__init__.pyo
@@ -2603,6 +2798,12 @@ ${PYSITELIB}/salt/states/bigip.pyo
 ${PYSITELIB}/salt/states/blockdev.py
 ${PYSITELIB}/salt/states/blockdev.pyc
 ${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_route53.py
+${PYSITELIB}/salt/states/boto3_route53.pyc
+${PYSITELIB}/salt/states/boto3_route53.pyo
 ${PYSITELIB}/salt/states/boto_apigateway.py
 ${PYSITELIB}/salt/states/boto_apigateway.pyc
 ${PYSITELIB}/salt/states/boto_apigateway.pyo
@@ -2642,6 +2843,9 @@ ${PYSITELIB}/salt/states/boto_elasticsearch_domain.pyo
 ${PYSITELIB}/salt/states/boto_elb.py
 ${PYSITELIB}/salt/states/boto_elb.pyc
 ${PYSITELIB}/salt/states/boto_elb.pyo
+${PYSITELIB}/salt/states/boto_elbv2.py
+${PYSITELIB}/salt/states/boto_elbv2.pyc
+${PYSITELIB}/salt/states/boto_elbv2.pyo
 ${PYSITELIB}/salt/states/boto_iam.py
 ${PYSITELIB}/salt/states/boto_iam.pyc
 ${PYSITELIB}/salt/states/boto_iam.pyo
@@ -2651,6 +2855,9 @@ ${PYSITELIB}/salt/states/boto_iam_role.pyo
 ${PYSITELIB}/salt/states/boto_iot.py
 ${PYSITELIB}/salt/states/boto_iot.pyc
 ${PYSITELIB}/salt/states/boto_iot.pyo
+${PYSITELIB}/salt/states/boto_kinesis.py
+${PYSITELIB}/salt/states/boto_kinesis.pyc
+${PYSITELIB}/salt/states/boto_kinesis.pyo
 ${PYSITELIB}/salt/states/boto_kms.py
 ${PYSITELIB}/salt/states/boto_kms.pyc
 ${PYSITELIB}/salt/states/boto_kms.pyo
@@ -2732,15 +2939,27 @@ ${PYSITELIB}/salt/states/dellchassis.pyo
 ${PYSITELIB}/salt/states/disk.py
 ${PYSITELIB}/salt/states/disk.pyc
 ${PYSITELIB}/salt/states/disk.pyo
-${PYSITELIB}/salt/states/dockerio.py
-${PYSITELIB}/salt/states/dockerio.pyc
-${PYSITELIB}/salt/states/dockerio.pyo
-${PYSITELIB}/salt/states/dockerng.py
-${PYSITELIB}/salt/states/dockerng.pyc
-${PYSITELIB}/salt/states/dockerng.pyo
+${PYSITELIB}/salt/states/docker.py
+${PYSITELIB}/salt/states/docker.pyc
+${PYSITELIB}/salt/states/docker.pyo
+${PYSITELIB}/salt/states/docker_container.py
+${PYSITELIB}/salt/states/docker_container.pyc
+${PYSITELIB}/salt/states/docker_container.pyo
+${PYSITELIB}/salt/states/docker_image.py
+${PYSITELIB}/salt/states/docker_image.pyc
+${PYSITELIB}/salt/states/docker_image.pyo
+${PYSITELIB}/salt/states/docker_network.py
+${PYSITELIB}/salt/states/docker_network.pyc
+${PYSITELIB}/salt/states/docker_network.pyo
+${PYSITELIB}/salt/states/docker_volume.py
+${PYSITELIB}/salt/states/docker_volume.pyc
+${PYSITELIB}/salt/states/docker_volume.pyo
 ${PYSITELIB}/salt/states/drac.py
 ${PYSITELIB}/salt/states/drac.pyc
 ${PYSITELIB}/salt/states/drac.pyo
+${PYSITELIB}/salt/states/elasticsearch.py
+${PYSITELIB}/salt/states/elasticsearch.pyc
+${PYSITELIB}/salt/states/elasticsearch.pyo
 ${PYSITELIB}/salt/states/elasticsearch_index.py
 ${PYSITELIB}/salt/states/elasticsearch_index.pyc
 ${PYSITELIB}/salt/states/elasticsearch_index.pyo
@@ -2798,6 +3017,18 @@ ${PYSITELIB}/salt/states/gpg.pyo
 ${PYSITELIB}/salt/states/grafana.py
 ${PYSITELIB}/salt/states/grafana.pyc
 ${PYSITELIB}/salt/states/grafana.pyo
+${PYSITELIB}/salt/states/grafana4_dashboard.py
+${PYSITELIB}/salt/states/grafana4_dashboard.pyc
+${PYSITELIB}/salt/states/grafana4_dashboard.pyo
+${PYSITELIB}/salt/states/grafana4_datasource.py
+${PYSITELIB}/salt/states/grafana4_datasource.pyc
+${PYSITELIB}/salt/states/grafana4_datasource.pyo
+${PYSITELIB}/salt/states/grafana4_org.py
+${PYSITELIB}/salt/states/grafana4_org.pyc
+${PYSITELIB}/salt/states/grafana4_org.pyo
+${PYSITELIB}/salt/states/grafana4_user.py
+${PYSITELIB}/salt/states/grafana4_user.pyc
+${PYSITELIB}/salt/states/grafana4_user.pyo
 ${PYSITELIB}/salt/states/grafana_dashboard.py
 ${PYSITELIB}/salt/states/grafana_dashboard.pyc
 ${PYSITELIB}/salt/states/grafana_dashboard.pyo
@@ -2810,6 +3041,9 @@ ${PYSITELIB}/salt/states/grains.pyo
 ${PYSITELIB}/salt/states/group.py
 ${PYSITELIB}/salt/states/group.pyc
 ${PYSITELIB}/salt/states/group.pyo
+${PYSITELIB}/salt/states/heat.py
+${PYSITELIB}/salt/states/heat.pyc
+${PYSITELIB}/salt/states/heat.pyo
 ${PYSITELIB}/salt/states/hg.py
 ${PYSITELIB}/salt/states/hg.pyc
 ${PYSITELIB}/salt/states/hg.pyo
@@ -2825,6 +3059,9 @@ ${PYSITELIB}/salt/states/htpasswd.pyo
 ${PYSITELIB}/salt/states/http.py
 ${PYSITELIB}/salt/states/http.pyc
 ${PYSITELIB}/salt/states/http.pyo
+${PYSITELIB}/salt/states/icinga2.py
+${PYSITELIB}/salt/states/icinga2.pyc
+${PYSITELIB}/salt/states/icinga2.pyo
 ${PYSITELIB}/salt/states/ifttt.py
 ${PYSITELIB}/salt/states/ifttt.pyc
 ${PYSITELIB}/salt/states/ifttt.pyo
@@ -2837,9 +3074,15 @@ ${PYSITELIB}/salt/states/influxdb08_database.pyo
 ${PYSITELIB}/salt/states/influxdb08_user.py
 ${PYSITELIB}/salt/states/influxdb08_user.pyc
 ${PYSITELIB}/salt/states/influxdb08_user.pyo
+${PYSITELIB}/salt/states/influxdb_continuous_query.py
+${PYSITELIB}/salt/states/influxdb_continuous_query.pyc
+${PYSITELIB}/salt/states/influxdb_continuous_query.pyo
 ${PYSITELIB}/salt/states/influxdb_database.py
 ${PYSITELIB}/salt/states/influxdb_database.pyc
 ${PYSITELIB}/salt/states/influxdb_database.pyo
+${PYSITELIB}/salt/states/influxdb_retention_policy.py
+${PYSITELIB}/salt/states/influxdb_retention_policy.pyc
+${PYSITELIB}/salt/states/influxdb_retention_policy.pyo
 ${PYSITELIB}/salt/states/influxdb_user.py
 ${PYSITELIB}/salt/states/influxdb_user.pyc
 ${PYSITELIB}/salt/states/influxdb_user.pyo
@@ -2882,6 +3125,9 @@ ${PYSITELIB}/salt/states/keystone.pyo
 ${PYSITELIB}/salt/states/kmod.py
 ${PYSITELIB}/salt/states/kmod.pyc
 ${PYSITELIB}/salt/states/kmod.pyo
+${PYSITELIB}/salt/states/kubernetes.py
+${PYSITELIB}/salt/states/kubernetes.pyc
+${PYSITELIB}/salt/states/kubernetes.pyo
 ${PYSITELIB}/salt/states/layman.py
 ${PYSITELIB}/salt/states/layman.pyc
 ${PYSITELIB}/salt/states/layman.pyo
@@ -2897,6 +3143,12 @@ ${PYSITELIB}/salt/states/linux_acl.pyo
 ${PYSITELIB}/salt/states/locale.py
 ${PYSITELIB}/salt/states/locale.pyc
 ${PYSITELIB}/salt/states/locale.pyo
+${PYSITELIB}/salt/states/logrotate.py
+${PYSITELIB}/salt/states/logrotate.pyc
+${PYSITELIB}/salt/states/logrotate.pyo
+${PYSITELIB}/salt/states/loop.py
+${PYSITELIB}/salt/states/loop.pyc
+${PYSITELIB}/salt/states/loop.pyo
 ${PYSITELIB}/salt/states/lvm.py
 ${PYSITELIB}/salt/states/lvm.pyc
 ${PYSITELIB}/salt/states/lvm.pyo
@@ -2957,6 +3209,9 @@ ${PYSITELIB}/salt/states/monit.pyo
 ${PYSITELIB}/salt/states/mount.py
 ${PYSITELIB}/salt/states/mount.pyc
 ${PYSITELIB}/salt/states/mount.pyo
+${PYSITELIB}/salt/states/msteams.py
+${PYSITELIB}/salt/states/msteams.pyc
+${PYSITELIB}/salt/states/msteams.pyo
 ${PYSITELIB}/salt/states/mysql_database.py
 ${PYSITELIB}/salt/states/mysql_database.pyc
 ${PYSITELIB}/salt/states/mysql_database.pyo
@@ -2969,6 +3224,12 @@ ${PYSITELIB}/salt/states/mysql_query.pyo
 ${PYSITELIB}/salt/states/mysql_user.py
 ${PYSITELIB}/salt/states/mysql_user.pyc
 ${PYSITELIB}/salt/states/mysql_user.pyo
+${PYSITELIB}/salt/states/netacl.py
+${PYSITELIB}/salt/states/netacl.pyc
+${PYSITELIB}/salt/states/netacl.pyo
+${PYSITELIB}/salt/states/netconfig.py
+${PYSITELIB}/salt/states/netconfig.pyc
+${PYSITELIB}/salt/states/netconfig.pyo
 ${PYSITELIB}/salt/states/netntp.py
 ${PYSITELIB}/salt/states/netntp.pyc
 ${PYSITELIB}/salt/states/netntp.pyo
@@ -2981,6 +3242,9 @@ ${PYSITELIB}/salt/states/netusers.pyo
 ${PYSITELIB}/salt/states/network.py
 ${PYSITELIB}/salt/states/network.pyc
 ${PYSITELIB}/salt/states/network.pyo
+${PYSITELIB}/salt/states/netyang.py
+${PYSITELIB}/salt/states/netyang.pyc
+${PYSITELIB}/salt/states/netyang.pyo
 ${PYSITELIB}/salt/states/nftables.py
 ${PYSITELIB}/salt/states/nftables.pyc
 ${PYSITELIB}/salt/states/nftables.pyo
@@ -3020,6 +3284,9 @@ ${PYSITELIB}/salt/states/pagerduty_user.pyo
 ${PYSITELIB}/salt/states/pcs.py
 ${PYSITELIB}/salt/states/pcs.pyc
 ${PYSITELIB}/salt/states/pcs.pyo
+${PYSITELIB}/salt/states/pdbedit.py
+${PYSITELIB}/salt/states/pdbedit.pyc
+${PYSITELIB}/salt/states/pdbedit.pyo
 ${PYSITELIB}/salt/states/pecl.py
 ${PYSITELIB}/salt/states/pecl.pyc
 ${PYSITELIB}/salt/states/pecl.pyo
@@ -3113,6 +3380,9 @@ ${PYSITELIB}/salt/states/rabbitmq_user.pyo
 ${PYSITELIB}/salt/states/rabbitmq_vhost.py
 ${PYSITELIB}/salt/states/rabbitmq_vhost.pyc
 ${PYSITELIB}/salt/states/rabbitmq_vhost.pyo
+${PYSITELIB}/salt/states/rbac_solaris.py
+${PYSITELIB}/salt/states/rbac_solaris.pyc
+${PYSITELIB}/salt/states/rbac_solaris.pyo
 ${PYSITELIB}/salt/states/rbenv.py
 ${PYSITELIB}/salt/states/rbenv.pyc
 ${PYSITELIB}/salt/states/rbenv.pyo
@@ -3161,6 +3431,9 @@ ${PYSITELIB}/salt/states/smtp.pyo
 ${PYSITELIB}/salt/states/snapper.py
 ${PYSITELIB}/salt/states/snapper.pyc
 ${PYSITELIB}/salt/states/snapper.pyo
+${PYSITELIB}/salt/states/solrcloud.py
+${PYSITELIB}/salt/states/solrcloud.pyc
+${PYSITELIB}/salt/states/solrcloud.pyo
 ${PYSITELIB}/salt/states/splunk.py
 ${PYSITELIB}/salt/states/splunk.pyc
 ${PYSITELIB}/salt/states/splunk.pyo
@@ -3182,6 +3455,9 @@ ${PYSITELIB}/salt/states/stateconf.pyo
 ${PYSITELIB}/salt/states/status.py
 ${PYSITELIB}/salt/states/status.pyc
 ${PYSITELIB}/salt/states/status.pyo
+${PYSITELIB}/salt/states/statuspage.py
+${PYSITELIB}/salt/states/statuspage.pyc
+${PYSITELIB}/salt/states/statuspage.pyo
 ${PYSITELIB}/salt/states/stormpath_account.py
 ${PYSITELIB}/salt/states/stormpath_account.pyc
 ${PYSITELIB}/salt/states/stormpath_account.pyo
@@ -3230,6 +3506,9 @@ ${PYSITELIB}/salt/states/uptime.pyo
 ${PYSITELIB}/salt/states/user.py
 ${PYSITELIB}/salt/states/user.pyc
 ${PYSITELIB}/salt/states/user.pyo
+${PYSITELIB}/salt/states/vault.py
+${PYSITELIB}/salt/states/vault.pyc
+${PYSITELIB}/salt/states/vault.pyo
 ${PYSITELIB}/salt/states/vbox_guest.py
 ${PYSITELIB}/salt/states/vbox_guest.pyc
 ${PYSITELIB}/salt/states/vbox_guest.pyo
@@ -3293,6 +3572,9 @@ ${PYSITELIB}/salt/states/win_system.pyo
 ${PYSITELIB}/salt/states/win_update.py
 ${PYSITELIB}/salt/states/win_update.pyc
 ${PYSITELIB}/salt/states/win_update.pyo
+${PYSITELIB}/salt/states/win_wua.py
+${PYSITELIB}/salt/states/win_wua.pyc
+${PYSITELIB}/salt/states/win_wua.pyo
 ${PYSITELIB}/salt/states/winrepo.py
 ${PYSITELIB}/salt/states/winrepo.pyc
 ${PYSITELIB}/salt/states/winrepo.pyo
@@ -3308,6 +3590,9 @@ ${PYSITELIB}/salt/states/zabbix_host.pyo
 ${PYSITELIB}/salt/states/zabbix_hostgroup.py
 ${PYSITELIB}/salt/states/zabbix_hostgroup.pyc
 ${PYSITELIB}/salt/states/zabbix_hostgroup.pyo
+${PYSITELIB}/salt/states/zabbix_mediatype.py
+${PYSITELIB}/salt/states/zabbix_mediatype.pyc
+${PYSITELIB}/salt/states/zabbix_mediatype.pyo
 ${PYSITELIB}/salt/states/zabbix_user.py
 ${PYSITELIB}/salt/states/zabbix_user.pyc
 ${PYSITELIB}/salt/states/zabbix_user.pyo
@@ -3326,6 +3611,9 @@ ${PYSITELIB}/salt/states/zfs.pyo
 ${PYSITELIB}/salt/states/zk_concurrency.py
 ${PYSITELIB}/salt/states/zk_concurrency.pyc
 ${PYSITELIB}/salt/states/zk_concurrency.pyo
+${PYSITELIB}/salt/states/zone.py
+${PYSITELIB}/salt/states/zone.pyc
+${PYSITELIB}/salt/states/zone.pyo
 ${PYSITELIB}/salt/states/zpool.py
 ${PYSITELIB}/salt/states/zpool.pyc
 ${PYSITELIB}/salt/states/zpool.pyo
@@ -3486,6 +3774,9 @@ ${PYSITELIB}/salt/utils/configcomparer.pyo
 ${PYSITELIB}/salt/utils/context.py
 ${PYSITELIB}/salt/utils/context.pyc
 ${PYSITELIB}/salt/utils/context.pyo
+${PYSITELIB}/salt/utils/crypt.py
+${PYSITELIB}/salt/utils/crypt.pyc
+${PYSITELIB}/salt/utils/crypt.pyo
 ${PYSITELIB}/salt/utils/debug.py
 ${PYSITELIB}/salt/utils/debug.pyc
 ${PYSITELIB}/salt/utils/debug.pyo
@@ -3507,6 +3798,12 @@ ${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.py
+${PYSITELIB}/salt/utils/docker/translate.pyc
+${PYSITELIB}/salt/utils/docker/translate.pyo
 ${PYSITELIB}/salt/utils/error.py
 ${PYSITELIB}/salt/utils/error.pyc
 ${PYSITELIB}/salt/utils/error.pyo
@@ -3543,6 +3840,9 @@ ${PYSITELIB}/salt/utils/github.pyo
 ${PYSITELIB}/salt/utils/gzip_util.py
 ${PYSITELIB}/salt/utils/gzip_util.pyc
 ${PYSITELIB}/salt/utils/gzip_util.pyo
+${PYSITELIB}/salt/utils/hashutils.py
+${PYSITELIB}/salt/utils/hashutils.pyc
+${PYSITELIB}/salt/utils/hashutils.pyo
 ${PYSITELIB}/salt/utils/http.py
 ${PYSITELIB}/salt/utils/http.pyc
 ${PYSITELIB}/salt/utils/http.pyo
@@ -3585,6 +3885,9 @@ ${PYSITELIB}/salt/utils/mako.pyo
 ${PYSITELIB}/salt/utils/master.py
 ${PYSITELIB}/salt/utils/master.pyc
 ${PYSITELIB}/salt/utils/master.pyo
+${PYSITELIB}/salt/utils/mattermost.py
+${PYSITELIB}/salt/utils/mattermost.pyc
+${PYSITELIB}/salt/utils/mattermost.pyo
 ${PYSITELIB}/salt/utils/memcached.py
 ${PYSITELIB}/salt/utils/memcached.pyc
 ${PYSITELIB}/salt/utils/memcached.pyo
@@ -3600,6 +3903,12 @@ ${PYSITELIB}/salt/utils/minions.pyo
 ${PYSITELIB}/salt/utils/msazure.py
 ${PYSITELIB}/salt/utils/msazure.pyc
 ${PYSITELIB}/salt/utils/msazure.pyo
+${PYSITELIB}/salt/utils/namecheap.py
+${PYSITELIB}/salt/utils/namecheap.pyc
+${PYSITELIB}/salt/utils/namecheap.pyo
+${PYSITELIB}/salt/utils/napalm.py
+${PYSITELIB}/salt/utils/napalm.pyc
+${PYSITELIB}/salt/utils/napalm.pyo
 ${PYSITELIB}/salt/utils/nb_popen.py
 ${PYSITELIB}/salt/utils/nb_popen.pyc
 ${PYSITELIB}/salt/utils/nb_popen.pyo
@@ -3636,6 +3945,9 @@ ${PYSITELIB}/salt/utils/pagerduty.pyo
 ${PYSITELIB}/salt/utils/parsers.py
 ${PYSITELIB}/salt/utils/parsers.pyc
 ${PYSITELIB}/salt/utils/parsers.pyo
+${PYSITELIB}/salt/utils/path.py
+${PYSITELIB}/salt/utils/path.pyc
+${PYSITELIB}/salt/utils/path.pyo
 ${PYSITELIB}/salt/utils/pkg/__init__.py
 ${PYSITELIB}/salt/utils/pkg/__init__.pyc
 ${PYSITELIB}/salt/utils/pkg/__init__.pyo
@@ -3750,6 +4062,9 @@ ${PYSITELIB}/salt/utils/vault.pyo
 ${PYSITELIB}/salt/utils/verify.py
 ${PYSITELIB}/salt/utils/verify.pyc
 ${PYSITELIB}/salt/utils/verify.pyo
+${PYSITELIB}/salt/utils/versions.py
+${PYSITELIB}/salt/utils/versions.pyc
+${PYSITELIB}/salt/utils/versions.pyo
 ${PYSITELIB}/salt/utils/virt.py
 ${PYSITELIB}/salt/utils/virt.pyc
 ${PYSITELIB}/salt/utils/virt.pyo
@@ -3765,6 +4080,9 @@ ${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_dacl.py
+${PYSITELIB}/salt/utils/win_dacl.pyc
+${PYSITELIB}/salt/utils/win_dacl.pyo
 ${PYSITELIB}/salt/utils/win_functions.py
 ${PYSITELIB}/salt/utils/win_functions.pyc
 ${PYSITELIB}/salt/utils/win_functions.pyo
@@ -3774,6 +4092,9 @@ ${PYSITELIB}/salt/utils/win_osinfo.pyo
 ${PYSITELIB}/salt/utils/win_runas.py
 ${PYSITELIB}/salt/utils/win_runas.pyc
 ${PYSITELIB}/salt/utils/win_runas.pyo
+${PYSITELIB}/salt/utils/win_update.py
+${PYSITELIB}/salt/utils/win_update.pyc
+${PYSITELIB}/salt/utils/win_update.pyo
 ${PYSITELIB}/salt/utils/winapi.py
 ${PYSITELIB}/salt/utils/winapi.pyc
 ${PYSITELIB}/salt/utils/winapi.pyo
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index 834aa573e8a..84226200e86 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.28 2017/07/05 11:02:16 sborrill Exp $
+$NetBSD: distinfo,v 1.29 2017/08/01 12:09:57 sborrill Exp $
 
-SHA1 (salt-2016.11.6.tar.gz) = f76d77ac54af70bd5676953a2ee218e183c72450
-RMD160 (salt-2016.11.6.tar.gz) = dd8488f8b162abb34b19f4ad0133f9c3a0869830
-SHA512 (salt-2016.11.6.tar.gz) = 8b375eeaf8380c750700ae9b500e012f0b8ae281c8b5aa68d3443393a5bb7dd46612f2aeb3ba01719dd28d9e128dc88f1faa8023f5f5e7ff684a1f0483c30120
-Size (salt-2016.11.6.tar.gz) = 9410028 bytes
+SHA1 (salt-2017.7.0.tar.gz) = 781fe938cbb8459cf776cb5f66ec9565586aa462
+RMD160 (salt-2017.7.0.tar.gz) = 1edf514774dfdb3139d1e4490f7a6c8d1fedd6fd
+SHA512 (salt-2017.7.0.tar.gz) = 21d8350413ad6a262d4c19c4cb3cbd4bc718f411bab49141626729b659c1ee72340542b342ec0fb012cb11c313bd56ec6534416d2128ae548ed8950affb6c834
+Size (salt-2017.7.0.tar.gz) = 11399842 bytes
+SHA1 (patch-salt_grains_core.py) = b1f21880b329571c92510c9cdb4d45878c458ee8
diff --git a/sysutils/salt/patches/patch-salt_grains_core.py b/sysutils/salt/patches/patch-salt_grains_core.py
new file mode 100644
index 00000000000..d3b98214572
--- /dev/null
+++ b/sysutils/salt/patches/patch-salt_grains_core.py
@@ -0,0 +1,18 @@
+$NetBSD: patch-salt_grains_core.py,v 1.1 2017/08/01 12:09:57 sborrill Exp $
+
+Disable ZFS grains on NetBSD.
+https://github.com/saltstack/salt/pull/42654
+
+--- salt/grains/core.py	2017-07-29 21:46:25.000000000 +0000
++++ salt/grains/core.py	2017-07-31 18:49:59.000000000 +0000
+@@ -2359,6 +2359,10 @@
+     if salt.utils.is_windows() or 'proxyminion' in __opts__:
+         return {}
+ 
++    # quickly return if NetBSD (ZFS still under development)
++    if salt.utils.is_netbsd():
++        return {}
++
+     # quickly return if no zpool and zfs command
+     if not salt.utils.which('zpool'):
+         return {}