sysutils/py-salt: update to 2016.3.4

PR:		214020
Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)

4 files changed, 97 insertions, 50 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index ab5def43a017..0d34e953b0a3 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2016.3.3
+PORTVERSION=	2016.3.4
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index de64bd360070..9b5e05f42336 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472308898
-SHA256 (salt-2016.3.3.tar.gz) = 5906038594f1b9b3ac41714774fbd78f0af80d2f3ffe1c1bf20308032d7d52b6
-SIZE (salt-2016.3.3.tar.gz) = 7952361
+TIMESTAMP = 1478030317
+SHA256 (salt-2016.3.4.tar.gz) = 5d4c822719d7fb2d79b0103cd9b015d251300890f8aa174e16b73fcfd6eb22f9
+SIZE (salt-2016.3.4.tar.gz) = 8354090
diff --git a/sysutils/py-salt/files/patch-freebsd_sysctl.py b/sysutils/py-salt/files/patch-freebsd_sysctl.py
new file mode 100644
index 000000000000..81c654b76bcd
--- /dev/null
+++ b/sysutils/py-salt/files/patch-freebsd_sysctl.py
@@ -0,0 +1,44 @@
+--- salt/modules/freebsd_sysctl.py.orig	2016-10-31 11:21:36.000000000 -0600
++++ salt/modules/freebsd_sysctl.py      2016-11-02 08:44:19.743993000 -0600
+@@ -56,17 +56,31 @@
+     )
+     cmd = 'sysctl -ae'
+     ret = {}
+-    out = __salt__['cmd.run'](cmd, output_loglevel='trace')
+     comps = ['']
+-    for line in out.splitlines():
+-        if any([line.startswith('{0}.'.format(root)) for root in roots]):
+-            comps = line.split('=', 1)
+-            ret[comps[0]] = comps[1]
+-        elif comps[0]:
+-            ret[comps[0]] += '{0}\n'.format(line)
+-        else:
+-            continue
+-    return ret
++
++    if config_file:
++        try:
++            with salt.utils.fopen(config_file, 'r') as f:
++                for line in f.readlines():
++                    l = line.strip()
++                    if l != "" and not l.startswith("#"):
++                        comps = line.split('=', 1)
++                        ret[comps[0]] = comps[1]
++            return ret
++        except (OSError, IOError):
++            log.error('Could not open sysctl config file')
++            return None
++    else:
++        out = __salt__['cmd.run'](cmd, output_loglevel='trace')
++        for line in out.splitlines():
++            if any([line.startswith('{0}.'.format(root)) for root in roots]):
++                comps = line.split('=', 1)
++                ret[comps[0]] = comps[1]
++            elif comps[0]:
++                ret[comps[0]] += '{0}\n'.format(line)
++            else:
++                 continue
++        return ret
+ 
+ 
+ def get(name):
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 2f1712971b1f..0b39e3782687 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -1,3 +1,4 @@
+
 %%ETCDIR%%/master.sample
 %%ETCDIR%%/minion.sample
 %%PYTHON_SITELIBDIR%%/salt/__init__.py
@@ -182,10 +183,10 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/saltify.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/scaleway.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/scaleway.pyc
-%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.py
-%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vmware.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vmware.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.py
@@ -194,6 +195,9 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vultrpy.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch-git.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch.sh
+%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/bootstrap-salt.sh
+%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/curl-bootstrap-git.sh
+%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/curl-bootstrap.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Debian-git.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Debian.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Fedora-git.sh
@@ -201,6 +205,7 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/FreeBSD-git.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/FreeBSD.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/None.sh
+%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/python-bootstrap.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/RHEL5-git.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/RHEL5.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/RHEL6-git.sh
@@ -208,10 +213,6 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/SmartOS.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Ubuntu-git.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Ubuntu.sh
-%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/bootstrap-salt.sh
-%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/curl-bootstrap-git.sh
-%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/curl-bootstrap.sh
-%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/python-bootstrap.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/wget-bootstrap-nocert.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/wget-bootstrap.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/exceptions.py
@@ -475,10 +476,10 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/btrfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/cabal.py
 %%PYTHON_SITELIBDIR%%/salt/modules/cabal.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/cassandra.py
+%%PYTHON_SITELIBDIR%%/salt/modules/cassandra.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/chassis.py
 %%PYTHON_SITELIBDIR%%/salt/modules/chassis.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/chef.py
@@ -669,10 +670,10 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/iwtools.py
 %%PYTHON_SITELIBDIR%%/salt/modules/iwtools.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/jboss7.py
+%%PYTHON_SITELIBDIR%%/salt/modules/jboss7.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/jenkins.py
 %%PYTHON_SITELIBDIR%%/salt/modules/jenkins.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/junos.py
@@ -787,10 +788,10 @@
 %%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/nagios_rpc.py
 %%PYTHON_SITELIBDIR%%/salt/modules/nagios_rpc.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/nagios.py
+%%PYTHON_SITELIBDIR%%/salt/modules/nagios.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/netaddress.py
 %%PYTHON_SITELIBDIR%%/salt/modules/netaddress.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsd_sysctl.py
@@ -839,10 +840,10 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/osquery.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/pacman.py
 %%PYTHON_SITELIBDIR%%/salt/modules/pacman.pyc
-%%PYTHON_SITELIBDIR%%/salt/modules/pagerduty.py
-%%PYTHON_SITELIBDIR%%/salt/modules/pagerduty.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/pagerduty_util.py
 %%PYTHON_SITELIBDIR%%/salt/modules/pagerduty_util.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/pagerduty.py
+%%PYTHON_SITELIBDIR%%/salt/modules/pagerduty.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/pam.py
 %%PYTHON_SITELIBDIR%%/salt/modules/pam.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/parallels.py
@@ -1001,18 +1002,18 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/solarispkg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/solr.py
 %%PYTHON_SITELIBDIR%%/salt/modules/solr.pyc
-%%PYTHON_SITELIBDIR%%/salt/modules/splunk.py
-%%PYTHON_SITELIBDIR%%/salt/modules/splunk.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/splunk_search.py
 %%PYTHON_SITELIBDIR%%/salt/modules/splunk_search.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/splunk.py
+%%PYTHON_SITELIBDIR%%/salt/modules/splunk.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/sqlite3.py
 %%PYTHON_SITELIBDIR%%/salt/modules/sqlite3.pyc
-%%PYTHON_SITELIBDIR%%/salt/modules/ssh.py
-%%PYTHON_SITELIBDIR%%/salt/modules/ssh.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/ssh_package.py
 %%PYTHON_SITELIBDIR%%/salt/modules/ssh_package.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/ssh_service.py
 %%PYTHON_SITELIBDIR%%/salt/modules/ssh_service.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/ssh.py
+%%PYTHON_SITELIBDIR%%/salt/modules/ssh.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/state.py
 %%PYTHON_SITELIBDIR%%/salt/modules/state.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/status.py
@@ -1035,20 +1036,20 @@
 %%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/system.py
+%%PYTHON_SITELIBDIR%%/salt/modules/system.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py
 %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/telemetry.py
 %%PYTHON_SITELIBDIR%%/salt/modules/telemetry.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/temp.py
 %%PYTHON_SITELIBDIR%%/salt/modules/temp.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/test.py
+%%PYTHON_SITELIBDIR%%/salt/modules/test.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/timezone.py
 %%PYTHON_SITELIBDIR%%/salt/modules/timezone.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/tls.py
@@ -1187,10 +1188,10 @@
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/event_processor.py
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/event_processor.pyc
-%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado.py
-%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado.pyc
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado_websockets.py
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado_websockets.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado.pyc
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_wsgi.py
 %%PYTHON_SITELIBDIR%%/salt/netapi/rest_wsgi.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/__init__.py
@@ -1373,10 +1374,10 @@
 %%PYTHON_SITELIBDIR%%/salt/returners/influxdb_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
 %%PYTHON_SITELIBDIR%%/salt/returners/local_cache.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/local.py
+%%PYTHON_SITELIBDIR%%/salt/returners/local.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/memcache_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/memcache_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/mongo_future_return.py
@@ -1393,10 +1394,10 @@
 %%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/postgres.py
+%%PYTHON_SITELIBDIR%%/salt/returners/postgres.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/pushover_returner.py
 %%PYTHON_SITELIBDIR%%/salt/returners/pushover_returner.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.py
@@ -1555,14 +1556,14 @@
 %%PYTHON_SITELIBDIR%%/salt/states/alias.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/alternatives.py
 %%PYTHON_SITELIBDIR%%/salt/states/alternatives.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/apache.py
-%%PYTHON_SITELIBDIR%%/salt/states/apache.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/apache_conf.py
 %%PYTHON_SITELIBDIR%%/salt/states/apache_conf.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/apache_module.py
 %%PYTHON_SITELIBDIR%%/salt/states/apache_module.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/apache_site.py
 %%PYTHON_SITELIBDIR%%/salt/states/apache_site.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/apache.py
+%%PYTHON_SITELIBDIR%%/salt/states/apache.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/aptpkg.py
 %%PYTHON_SITELIBDIR%%/salt/states/aptpkg.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/archive.py
@@ -1599,10 +1600,10 @@
 %%PYTHON_SITELIBDIR%%/salt/states/boto_elasticache.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_elb.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_elb.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/boto_iam.py
-%%PYTHON_SITELIBDIR%%/salt/states/boto_iam.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_iam_role.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_iam_role.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_iam.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_iam.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_iot.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_iot.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_kms.py
@@ -1659,10 +1660,10 @@
 %%PYTHON_SITELIBDIR%%/salt/states/dockerng.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/drac.py
 %%PYTHON_SITELIBDIR%%/salt/states/drac.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/elasticsearch_index.py
-%%PYTHON_SITELIBDIR%%/salt/states/elasticsearch_index.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/elasticsearch_index_template.py
 %%PYTHON_SITELIBDIR%%/salt/states/elasticsearch_index_template.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/elasticsearch_index.py
+%%PYTHON_SITELIBDIR%%/salt/states/elasticsearch_index.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/environ.py
 %%PYTHON_SITELIBDIR%%/salt/states/environ.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/eselect.py
@@ -1693,12 +1694,12 @@
 %%PYTHON_SITELIBDIR%%/salt/states/gnomedesktop.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/gpg.py
 %%PYTHON_SITELIBDIR%%/salt/states/gpg.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/grafana.py
-%%PYTHON_SITELIBDIR%%/salt/states/grafana.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/grafana_dashboard.py
 %%PYTHON_SITELIBDIR%%/salt/states/grafana_dashboard.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/grafana_datasource.py
 %%PYTHON_SITELIBDIR%%/salt/states/grafana_datasource.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
@@ -1775,10 +1776,10 @@
 %%PYTHON_SITELIBDIR%%/salt/states/mdadm.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/memcached.py
 %%PYTHON_SITELIBDIR%%/salt/states/memcached.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/modjk.py
-%%PYTHON_SITELIBDIR%%/salt/states/modjk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/modjk_worker.py
 %%PYTHON_SITELIBDIR%%/salt/states/modjk_worker.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/modjk.py
+%%PYTHON_SITELIBDIR%%/salt/states/modjk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/module.py
 %%PYTHON_SITELIBDIR%%/salt/states/module.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/mongodb_database.py
@@ -1811,8 +1812,6 @@
 %%PYTHON_SITELIBDIR%%/salt/states/openvswitch_bridge.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/openvswitch_port.py
 %%PYTHON_SITELIBDIR%%/salt/states/openvswitch_port.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/pagerduty.py
-%%PYTHON_SITELIBDIR%%/salt/states/pagerduty.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pagerduty_escalation_policy.py
 %%PYTHON_SITELIBDIR%%/salt/states/pagerduty_escalation_policy.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pagerduty_schedule.py
@@ -1821,6 +1820,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/pagerduty_service.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pagerduty_user.py
 %%PYTHON_SITELIBDIR%%/salt/states/pagerduty_user.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/pagerduty.py
+%%PYTHON_SITELIBDIR%%/salt/states/pagerduty.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pecl.py
 %%PYTHON_SITELIBDIR%%/salt/states/pecl.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pip_state.py
@@ -1911,10 +1912,10 @@
 %%PYTHON_SITELIBDIR%%/salt/states/smartos.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/smtp.py
 %%PYTHON_SITELIBDIR%%/salt/states/smtp.pyc
-%%PYTHON_SITELIBDIR%%/salt/states/splunk.py
-%%PYTHON_SITELIBDIR%%/salt/states/splunk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/splunk_search.py
 %%PYTHON_SITELIBDIR%%/salt/states/splunk_search.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/splunk.py
+%%PYTHON_SITELIBDIR%%/salt/states/splunk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/sqlite3.py
 %%PYTHON_SITELIBDIR%%/salt/states/sqlite3.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_auth.py
@@ -2096,12 +2097,12 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/aws.py
 %%PYTHON_SITELIBDIR%%/salt/utils/aws.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/boto_elb_tag.py
+%%PYTHON_SITELIBDIR%%/salt/utils/boto_elb_tag.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/boto.py
 %%PYTHON_SITELIBDIR%%/salt/utils/boto.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/boto3.py
 %%PYTHON_SITELIBDIR%%/salt/utils/boto3.pyc
-%%PYTHON_SITELIBDIR%%/salt/utils/boto_elb_tag.py
-%%PYTHON_SITELIBDIR%%/salt/utils/boto_elb_tag.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/cache.py
 %%PYTHON_SITELIBDIR%%/salt/utils/cache.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/cloud.py
@@ -2278,10 +2279,12 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/virt.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/vmware.py
 %%PYTHON_SITELIBDIR%%/salt/utils/vmware.pyc
-%%PYTHON_SITELIBDIR%%/salt/utils/vt.py
-%%PYTHON_SITELIBDIR%%/salt/utils/vt.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/vt_helper.py
 %%PYTHON_SITELIBDIR%%/salt/utils/vt_helper.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/vt.py
+%%PYTHON_SITELIBDIR%%/salt/utils/vt.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/win_osinfo.py
+%%PYTHON_SITELIBDIR%%/salt/utils/win_osinfo.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/win_runas.py
 %%PYTHON_SITELIBDIR%%/salt/utils/win_runas.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/winapi.py