summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/salt/Makefile22
-rw-r--r--sysutils/salt/PLIST363
-rw-r--r--sysutils/salt/distinfo13
-rw-r--r--sysutils/salt/patches/patch-salt_modules_status.py15
-rw-r--r--sysutils/salt/patches/patch-salt_utils_____init____.py21
-rw-r--r--sysutils/salt/patches/patch-salt_utils_network.py81
6 files changed, 369 insertions, 146 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index d948e492a3f..d2280566f19 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2017/01/01 14:43:58 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2017/02/03 13:39:00 sborrill Exp $
-DISTNAME= salt-2016.3.3
+DISTNAME= salt-2016.11.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
@@ -24,15 +24,15 @@ BUILD_DEFS+= VARBASE
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-m2crypto
-PYSETUPINSTALLARGS+= --salt-root-dir=${PREFIX}
-PYSETUPINSTALLARGS+= --salt-config-dir=${PKG_SYSCONFDIR}
-PYSETUPINSTALLARGS+= --salt-cache-dir=${VARBASE}/cache/salt
-PYSETUPINSTALLARGS+= --salt-sock-dir=${VARBASE}/run/salt
-PYSETUPINSTALLARGS+= --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states
-PYSETUPINSTALLARGS+= --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar
-PYSETUPINSTALLARGS+= --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master
-PYSETUPINSTALLARGS+= --salt-logs-dir=${VARBASE}/log/salt
-PYSETUPINSTALLARGS+= --salt-pidfile-dir=${VARBASE}/run
+PYSETUPARGS+= --salt-root-dir=${PREFIX}
+PYSETUPARGS+= --salt-config-dir=${PKG_SYSCONFDIR}
+PYSETUPARGS+= --salt-cache-dir=${VARBASE}/cache/salt
+PYSETUPARGS+= --salt-sock-dir=${VARBASE}/run/salt
+PYSETUPARGS+= --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states
+PYSETUPARGS+= --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar
+PYSETUPARGS+= --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master
+PYSETUPARGS+= --salt-logs-dir=${VARBASE}/log/salt
+PYSETUPARGS+= --salt-pidfile-dir=${VARBASE}/run
REPLACE_PYTHON= *.py */*.py */*/*.py
REPLACE_SH= salt/templates/git/ssh-id-wrapper
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index 7bf5d48bda0..ccc5ff78e93 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2016/09/19 13:34:37 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.18 2017/02/03 13:39:00 sborrill Exp $
bin/salt
bin/salt-api
bin/salt-call
@@ -71,6 +71,12 @@ ${PYSITELIB}/salt/beacons/__init__.pyo
${PYSITELIB}/salt/beacons/adb.py
${PYSITELIB}/salt/beacons/adb.pyc
${PYSITELIB}/salt/beacons/adb.pyo
+${PYSITELIB}/salt/beacons/avahi_announce.py
+${PYSITELIB}/salt/beacons/avahi_announce.pyc
+${PYSITELIB}/salt/beacons/avahi_announce.pyo
+${PYSITELIB}/salt/beacons/bonjour_announce.py
+${PYSITELIB}/salt/beacons/bonjour_announce.pyc
+${PYSITELIB}/salt/beacons/bonjour_announce.pyo
${PYSITELIB}/salt/beacons/btmp.py
${PYSITELIB}/salt/beacons/btmp.pyc
${PYSITELIB}/salt/beacons/btmp.pyo
@@ -80,6 +86,9 @@ ${PYSITELIB}/salt/beacons/diskusage.pyo
${PYSITELIB}/salt/beacons/glxinfo.py
${PYSITELIB}/salt/beacons/glxinfo.pyc
${PYSITELIB}/salt/beacons/glxinfo.pyo
+${PYSITELIB}/salt/beacons/haproxy.py
+${PYSITELIB}/salt/beacons/haproxy.pyc
+${PYSITELIB}/salt/beacons/haproxy.pyo
${PYSITELIB}/salt/beacons/inotify.py
${PYSITELIB}/salt/beacons/inotify.pyc
${PYSITELIB}/salt/beacons/inotify.pyo
@@ -116,12 +125,24 @@ ${PYSITELIB}/salt/beacons/service.pyo
${PYSITELIB}/salt/beacons/sh.py
${PYSITELIB}/salt/beacons/sh.pyc
${PYSITELIB}/salt/beacons/sh.pyo
+${PYSITELIB}/salt/beacons/status.py
+${PYSITELIB}/salt/beacons/status.pyc
+${PYSITELIB}/salt/beacons/status.pyo
${PYSITELIB}/salt/beacons/twilio_txt_msg.py
${PYSITELIB}/salt/beacons/twilio_txt_msg.pyc
${PYSITELIB}/salt/beacons/twilio_txt_msg.pyo
${PYSITELIB}/salt/beacons/wtmp.py
${PYSITELIB}/salt/beacons/wtmp.pyc
${PYSITELIB}/salt/beacons/wtmp.pyo
+${PYSITELIB}/salt/cache/__init__.py
+${PYSITELIB}/salt/cache/__init__.pyc
+${PYSITELIB}/salt/cache/__init__.pyo
+${PYSITELIB}/salt/cache/consul.py
+${PYSITELIB}/salt/cache/consul.pyc
+${PYSITELIB}/salt/cache/consul.pyo
+${PYSITELIB}/salt/cache/localfs.py
+${PYSITELIB}/salt/cache/localfs.pyc
+${PYSITELIB}/salt/cache/localfs.pyo
${PYSITELIB}/salt/cli/__init__.py
${PYSITELIB}/salt/cli/__init__.pyc
${PYSITELIB}/salt/cli/__init__.pyo
@@ -224,6 +245,9 @@ ${PYSITELIB}/salt/cloud/clouds/__init__.pyo
${PYSITELIB}/salt/cloud/clouds/aliyun.py
${PYSITELIB}/salt/cloud/clouds/aliyun.pyc
${PYSITELIB}/salt/cloud/clouds/aliyun.pyo
+${PYSITELIB}/salt/cloud/clouds/azurearm.py
+${PYSITELIB}/salt/cloud/clouds/azurearm.pyc
+${PYSITELIB}/salt/cloud/clouds/azurearm.pyo
${PYSITELIB}/salt/cloud/clouds/cloudstack.py
${PYSITELIB}/salt/cloud/clouds/cloudstack.pyc
${PYSITELIB}/salt/cloud/clouds/cloudstack.pyo
@@ -293,12 +317,12 @@ ${PYSITELIB}/salt/cloud/clouds/softlayer.pyo
${PYSITELIB}/salt/cloud/clouds/softlayer_hw.py
${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyc
${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyo
+${PYSITELIB}/salt/cloud/clouds/virtualbox.py
+${PYSITELIB}/salt/cloud/clouds/virtualbox.pyc
+${PYSITELIB}/salt/cloud/clouds/virtualbox.pyo
${PYSITELIB}/salt/cloud/clouds/vmware.py
${PYSITELIB}/salt/cloud/clouds/vmware.pyc
${PYSITELIB}/salt/cloud/clouds/vmware.pyo
-${PYSITELIB}/salt/cloud/clouds/vsphere.py
-${PYSITELIB}/salt/cloud/clouds/vsphere.pyc
-${PYSITELIB}/salt/cloud/clouds/vsphere.pyo
${PYSITELIB}/salt/cloud/clouds/vultrpy.py
${PYSITELIB}/salt/cloud/clouds/vultrpy.pyc
${PYSITELIB}/salt/cloud/clouds/vultrpy.pyo
@@ -431,12 +455,21 @@ ${PYSITELIB}/salt/engines/__init__.pyo
${PYSITELIB}/salt/engines/docker_events.py
${PYSITELIB}/salt/engines/docker_events.pyc
${PYSITELIB}/salt/engines/docker_events.pyo
+${PYSITELIB}/salt/engines/hipchat.py
+${PYSITELIB}/salt/engines/hipchat.pyc
+${PYSITELIB}/salt/engines/hipchat.pyo
+${PYSITELIB}/salt/engines/http_logstash.py
+${PYSITELIB}/salt/engines/http_logstash.pyc
+${PYSITELIB}/salt/engines/http_logstash.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/reactor.py
+${PYSITELIB}/salt/engines/reactor.pyc
+${PYSITELIB}/salt/engines/reactor.pyo
${PYSITELIB}/salt/engines/redis_sentinel.py
${PYSITELIB}/salt/engines/redis_sentinel.pyc
${PYSITELIB}/salt/engines/redis_sentinel.pyo
@@ -542,6 +575,12 @@ ${PYSITELIB}/salt/grains/mdadm.pyo
${PYSITELIB}/salt/grains/minion_process.py
${PYSITELIB}/salt/grains/minion_process.pyc
${PYSITELIB}/salt/grains/minion_process.pyo
+${PYSITELIB}/salt/grains/napalm.py
+${PYSITELIB}/salt/grains/napalm.pyc
+${PYSITELIB}/salt/grains/napalm.pyo
+${PYSITELIB}/salt/grains/nxos.py
+${PYSITELIB}/salt/grains/nxos.pyc
+${PYSITELIB}/salt/grains/nxos.pyo
${PYSITELIB}/salt/grains/opts.py
${PYSITELIB}/salt/grains/opts.pyc
${PYSITELIB}/salt/grains/opts.pyo
@@ -593,6 +632,9 @@ ${PYSITELIB}/salt/minion.pyo
${PYSITELIB}/salt/modules/__init__.py
${PYSITELIB}/salt/modules/__init__.pyc
${PYSITELIB}/salt/modules/__init__.pyo
+${PYSITELIB}/salt/modules/acme.py
+${PYSITELIB}/salt/modules/acme.pyc
+${PYSITELIB}/salt/modules/acme.pyo
${PYSITELIB}/salt/modules/aliases.py
${PYSITELIB}/salt/modules/aliases.pyc
${PYSITELIB}/salt/modules/aliases.pyo
@@ -602,6 +644,12 @@ ${PYSITELIB}/salt/modules/alternatives.pyo
${PYSITELIB}/salt/modules/apache.py
${PYSITELIB}/salt/modules/apache.pyc
${PYSITELIB}/salt/modules/apache.pyo
+${PYSITELIB}/salt/modules/apcups.py
+${PYSITELIB}/salt/modules/apcups.pyc
+${PYSITELIB}/salt/modules/apcups.pyo
+${PYSITELIB}/salt/modules/apf.py
+${PYSITELIB}/salt/modules/apf.pyc
+${PYSITELIB}/salt/modules/apf.pyo
${PYSITELIB}/salt/modules/aptpkg.py
${PYSITELIB}/salt/modules/aptpkg.pyc
${PYSITELIB}/salt/modules/aptpkg.pyo
@@ -638,6 +686,9 @@ ${PYSITELIB}/salt/modules/blockdev.pyo
${PYSITELIB}/salt/modules/bluez.py
${PYSITELIB}/salt/modules/bluez.pyc
${PYSITELIB}/salt/modules/bluez.pyo
+${PYSITELIB}/salt/modules/boto_apigateway.py
+${PYSITELIB}/salt/modules/boto_apigateway.pyc
+${PYSITELIB}/salt/modules/boto_apigateway.pyo
${PYSITELIB}/salt/modules/boto_asg.py
${PYSITELIB}/salt/modules/boto_asg.pyc
${PYSITELIB}/salt/modules/boto_asg.pyo
@@ -650,6 +701,12 @@ ${PYSITELIB}/salt/modules/boto_cloudtrail.pyo
${PYSITELIB}/salt/modules/boto_cloudwatch.py
${PYSITELIB}/salt/modules/boto_cloudwatch.pyc
${PYSITELIB}/salt/modules/boto_cloudwatch.pyo
+${PYSITELIB}/salt/modules/boto_cloudwatch_event.py
+${PYSITELIB}/salt/modules/boto_cloudwatch_event.pyc
+${PYSITELIB}/salt/modules/boto_cloudwatch_event.pyo
+${PYSITELIB}/salt/modules/boto_cognitoidentity.py
+${PYSITELIB}/salt/modules/boto_cognitoidentity.pyc
+${PYSITELIB}/salt/modules/boto_cognitoidentity.pyo
${PYSITELIB}/salt/modules/boto_datapipeline.py
${PYSITELIB}/salt/modules/boto_datapipeline.pyc
${PYSITELIB}/salt/modules/boto_datapipeline.pyo
@@ -662,6 +719,9 @@ ${PYSITELIB}/salt/modules/boto_ec2.pyo
${PYSITELIB}/salt/modules/boto_elasticache.py
${PYSITELIB}/salt/modules/boto_elasticache.pyc
${PYSITELIB}/salt/modules/boto_elasticache.pyo
+${PYSITELIB}/salt/modules/boto_elasticsearch_domain.py
+${PYSITELIB}/salt/modules/boto_elasticsearch_domain.pyc
+${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
@@ -719,6 +779,12 @@ ${PYSITELIB}/salt/modules/cassandra.pyo
${PYSITELIB}/salt/modules/cassandra_cql.py
${PYSITELIB}/salt/modules/cassandra_cql.pyc
${PYSITELIB}/salt/modules/cassandra_cql.pyo
+${PYSITELIB}/salt/modules/celery.py
+${PYSITELIB}/salt/modules/celery.pyc
+${PYSITELIB}/salt/modules/celery.pyo
+${PYSITELIB}/salt/modules/ceph.py
+${PYSITELIB}/salt/modules/ceph.pyc
+${PYSITELIB}/salt/modules/ceph.pyo
${PYSITELIB}/salt/modules/chassis.py
${PYSITELIB}/salt/modules/chassis.pyc
${PYSITELIB}/salt/modules/chassis.pyo
@@ -731,6 +797,9 @@ ${PYSITELIB}/salt/modules/chocolatey.pyo
${PYSITELIB}/salt/modules/chronos.py
${PYSITELIB}/salt/modules/chronos.pyc
${PYSITELIB}/salt/modules/chronos.pyo
+${PYSITELIB}/salt/modules/cisconso.py
+${PYSITELIB}/salt/modules/cisconso.pyc
+${PYSITELIB}/salt/modules/cisconso.pyo
${PYSITELIB}/salt/modules/cloud.py
${PYSITELIB}/salt/modules/cloud.pyc
${PYSITELIB}/salt/modules/cloud.pyo
@@ -758,6 +827,9 @@ ${PYSITELIB}/salt/modules/cpan.pyo
${PYSITELIB}/salt/modules/cron.py
${PYSITELIB}/salt/modules/cron.pyc
${PYSITELIB}/salt/modules/cron.pyo
+${PYSITELIB}/salt/modules/csf.py
+${PYSITELIB}/salt/modules/csf.pyc
+${PYSITELIB}/salt/modules/csf.pyo
${PYSITELIB}/salt/modules/cyg.py
${PYSITELIB}/salt/modules/cyg.pyc
${PYSITELIB}/salt/modules/cyg.pyo
@@ -965,6 +1037,9 @@ ${PYSITELIB}/salt/modules/incron.pyo
${PYSITELIB}/salt/modules/influx.py
${PYSITELIB}/salt/modules/influx.pyc
${PYSITELIB}/salt/modules/influx.pyo
+${PYSITELIB}/salt/modules/influx08.py
+${PYSITELIB}/salt/modules/influx08.pyc
+${PYSITELIB}/salt/modules/influx08.pyo
${PYSITELIB}/salt/modules/infoblox.py
${PYSITELIB}/salt/modules/infoblox.pyc
${PYSITELIB}/salt/modules/infoblox.pyo
@@ -980,15 +1055,24 @@ ${PYSITELIB}/salt/modules/inspectlib/collector.pyo
${PYSITELIB}/salt/modules/inspectlib/dbhandle.py
${PYSITELIB}/salt/modules/inspectlib/dbhandle.pyc
${PYSITELIB}/salt/modules/inspectlib/dbhandle.pyo
+${PYSITELIB}/salt/modules/inspectlib/entities.py
+${PYSITELIB}/salt/modules/inspectlib/entities.pyc
+${PYSITELIB}/salt/modules/inspectlib/entities.pyo
${PYSITELIB}/salt/modules/inspectlib/exceptions.py
${PYSITELIB}/salt/modules/inspectlib/exceptions.pyc
${PYSITELIB}/salt/modules/inspectlib/exceptions.pyo
+${PYSITELIB}/salt/modules/inspectlib/fsdb.py
+${PYSITELIB}/salt/modules/inspectlib/fsdb.pyc
+${PYSITELIB}/salt/modules/inspectlib/fsdb.pyo
${PYSITELIB}/salt/modules/inspectlib/kiwiproc.py
${PYSITELIB}/salt/modules/inspectlib/kiwiproc.pyc
${PYSITELIB}/salt/modules/inspectlib/kiwiproc.pyo
${PYSITELIB}/salt/modules/inspectlib/query.py
${PYSITELIB}/salt/modules/inspectlib/query.pyc
${PYSITELIB}/salt/modules/inspectlib/query.pyo
+${PYSITELIB}/salt/modules/inspector.py
+${PYSITELIB}/salt/modules/inspector.pyc
+${PYSITELIB}/salt/modules/inspector.pyo
${PYSITELIB}/salt/modules/introspect.py
${PYSITELIB}/salt/modules/introspect.pyc
${PYSITELIB}/salt/modules/introspect.pyo
@@ -1019,6 +1103,9 @@ ${PYSITELIB}/salt/modules/junos.pyo
${PYSITELIB}/salt/modules/k8s.py
${PYSITELIB}/salt/modules/k8s.pyc
${PYSITELIB}/salt/modules/k8s.pyo
+${PYSITELIB}/salt/modules/kapacitor.py
+${PYSITELIB}/salt/modules/kapacitor.pyc
+${PYSITELIB}/salt/modules/kapacitor.pyo
${PYSITELIB}/salt/modules/kerberos.py
${PYSITELIB}/salt/modules/kerberos.pyc
${PYSITELIB}/salt/modules/kerberos.pyo
@@ -1046,6 +1133,9 @@ ${PYSITELIB}/salt/modules/ldap3.pyo
${PYSITELIB}/salt/modules/ldapmod.py
${PYSITELIB}/salt/modules/ldapmod.pyc
${PYSITELIB}/salt/modules/ldapmod.pyo
+${PYSITELIB}/salt/modules/libcloud_dns.py
+${PYSITELIB}/salt/modules/libcloud_dns.pyc
+${PYSITELIB}/salt/modules/libcloud_dns.pyo
${PYSITELIB}/salt/modules/linux_acl.py
${PYSITELIB}/salt/modules/linux_acl.pyc
${PYSITELIB}/salt/modules/linux_acl.pyo
@@ -1094,6 +1184,9 @@ ${PYSITELIB}/salt/modules/mac_group.pyo
${PYSITELIB}/salt/modules/mac_keychain.py
${PYSITELIB}/salt/modules/mac_keychain.pyc
${PYSITELIB}/salt/modules/mac_keychain.pyo
+${PYSITELIB}/salt/modules/mac_package.py
+${PYSITELIB}/salt/modules/mac_package.pyc
+${PYSITELIB}/salt/modules/mac_package.pyo
${PYSITELIB}/salt/modules/mac_pkgutil.py
${PYSITELIB}/salt/modules/mac_pkgutil.pyc
${PYSITELIB}/salt/modules/mac_pkgutil.pyo
@@ -1187,6 +1280,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/napalm_bgp.py
+${PYSITELIB}/salt/modules/napalm_bgp.pyc
+${PYSITELIB}/salt/modules/napalm_bgp.pyo
+${PYSITELIB}/salt/modules/napalm_network.py
+${PYSITELIB}/salt/modules/napalm_network.pyc
+${PYSITELIB}/salt/modules/napalm_network.pyo
+${PYSITELIB}/salt/modules/napalm_ntp.py
+${PYSITELIB}/salt/modules/napalm_ntp.pyc
+${PYSITELIB}/salt/modules/napalm_ntp.pyo
+${PYSITELIB}/salt/modules/napalm_probes.py
+${PYSITELIB}/salt/modules/napalm_probes.pyc
+${PYSITELIB}/salt/modules/napalm_probes.pyo
+${PYSITELIB}/salt/modules/napalm_route.py
+${PYSITELIB}/salt/modules/napalm_route.pyc
+${PYSITELIB}/salt/modules/napalm_route.pyo
+${PYSITELIB}/salt/modules/napalm_snmp.py
+${PYSITELIB}/salt/modules/napalm_snmp.pyc
+${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/netaddress.py
${PYSITELIB}/salt/modules/netaddress.pyc
${PYSITELIB}/salt/modules/netaddress.pyo
@@ -1214,9 +1328,6 @@ ${PYSITELIB}/salt/modules/nftables.pyo
${PYSITELIB}/salt/modules/nginx.py
${PYSITELIB}/salt/modules/nginx.pyc
${PYSITELIB}/salt/modules/nginx.pyo
-${PYSITELIB}/salt/modules/node.py
-${PYSITELIB}/salt/modules/node.pyc
-${PYSITELIB}/salt/modules/node.pyo
${PYSITELIB}/salt/modules/nova.py
${PYSITELIB}/salt/modules/nova.pyc
${PYSITELIB}/salt/modules/nova.pyo
@@ -1226,6 +1337,9 @@ ${PYSITELIB}/salt/modules/npm.pyo
${PYSITELIB}/salt/modules/nspawn.py
${PYSITELIB}/salt/modules/nspawn.pyc
${PYSITELIB}/salt/modules/nspawn.pyo
+${PYSITELIB}/salt/modules/nxos.py
+${PYSITELIB}/salt/modules/nxos.pyc
+${PYSITELIB}/salt/modules/nxos.pyo
${PYSITELIB}/salt/modules/omapi.py
${PYSITELIB}/salt/modules/omapi.pyc
${PYSITELIB}/salt/modules/omapi.pyo
@@ -1244,6 +1358,9 @@ ${PYSITELIB}/salt/modules/openbsdservice.pyo
${PYSITELIB}/salt/modules/openstack_config.py
${PYSITELIB}/salt/modules/openstack_config.pyc
${PYSITELIB}/salt/modules/openstack_config.pyo
+${PYSITELIB}/salt/modules/openstack_mng.py
+${PYSITELIB}/salt/modules/openstack_mng.pyc
+${PYSITELIB}/salt/modules/openstack_mng.pyo
${PYSITELIB}/salt/modules/openvswitch.py
${PYSITELIB}/salt/modules/openvswitch.pyc
${PYSITELIB}/salt/modules/openvswitch.pyo
@@ -1274,6 +1391,9 @@ ${PYSITELIB}/salt/modules/parallels.pyo
${PYSITELIB}/salt/modules/parted.py
${PYSITELIB}/salt/modules/parted.pyc
${PYSITELIB}/salt/modules/parted.pyo
+${PYSITELIB}/salt/modules/pcs.py
+${PYSITELIB}/salt/modules/pcs.pyc
+${PYSITELIB}/salt/modules/pcs.pyo
${PYSITELIB}/salt/modules/pecl.py
${PYSITELIB}/salt/modules/pecl.pyc
${PYSITELIB}/salt/modules/pecl.pyo
@@ -1451,6 +1571,9 @@ ${PYSITELIB}/salt/modules/serverdensity_device.pyo
${PYSITELIB}/salt/modules/service.py
${PYSITELIB}/salt/modules/service.pyc
${PYSITELIB}/salt/modules/service.pyo
+${PYSITELIB}/salt/modules/servicenow.py
+${PYSITELIB}/salt/modules/servicenow.pyc
+${PYSITELIB}/salt/modules/servicenow.pyo
${PYSITELIB}/salt/modules/shadow.py
${PYSITELIB}/salt/modules/shadow.pyc
${PYSITELIB}/salt/modules/shadow.pyo
@@ -1463,6 +1586,9 @@ ${PYSITELIB}/salt/modules/slsutil.pyo
${PYSITELIB}/salt/modules/smartos_imgadm.py
${PYSITELIB}/salt/modules/smartos_imgadm.pyc
${PYSITELIB}/salt/modules/smartos_imgadm.pyo
+${PYSITELIB}/salt/modules/smartos_nictagadm.py
+${PYSITELIB}/salt/modules/smartos_nictagadm.pyc
+${PYSITELIB}/salt/modules/smartos_nictagadm.pyo
${PYSITELIB}/salt/modules/smartos_virt.py
${PYSITELIB}/salt/modules/smartos_virt.pyc
${PYSITELIB}/salt/modules/smartos_virt.pyo
@@ -1478,6 +1604,9 @@ ${PYSITELIB}/salt/modules/smf.pyo
${PYSITELIB}/salt/modules/smtp.py
${PYSITELIB}/salt/modules/smtp.pyc
${PYSITELIB}/salt/modules/smtp.pyo
+${PYSITELIB}/salt/modules/snapper.py
+${PYSITELIB}/salt/modules/snapper.pyc
+${PYSITELIB}/salt/modules/snapper.pyo
${PYSITELIB}/salt/modules/solaris_fmadm.py
${PYSITELIB}/salt/modules/solaris_fmadm.pyc
${PYSITELIB}/salt/modules/solaris_fmadm.pyo
@@ -1574,6 +1703,9 @@ ${PYSITELIB}/salt/modules/test.pyo
${PYSITELIB}/salt/modules/test_virtual.py
${PYSITELIB}/salt/modules/test_virtual.pyc
${PYSITELIB}/salt/modules/test_virtual.pyo
+${PYSITELIB}/salt/modules/testinframod.py
+${PYSITELIB}/salt/modules/testinframod.pyc
+${PYSITELIB}/salt/modules/testinframod.pyo
${PYSITELIB}/salt/modules/timezone.py
${PYSITELIB}/salt/modules/timezone.pyc
${PYSITELIB}/salt/modules/timezone.pyo
@@ -1664,6 +1796,9 @@ ${PYSITELIB}/salt/modules/win_iis.pyo
${PYSITELIB}/salt/modules/win_ip.py
${PYSITELIB}/salt/modules/win_ip.pyc
${PYSITELIB}/salt/modules/win_ip.pyo
+${PYSITELIB}/salt/modules/win_lgpo.py
+${PYSITELIB}/salt/modules/win_lgpo.pyc
+${PYSITELIB}/salt/modules/win_lgpo.pyo
${PYSITELIB}/salt/modules/win_license.py
${PYSITELIB}/salt/modules/win_license.pyc
${PYSITELIB}/salt/modules/win_license.pyo
@@ -1679,9 +1814,15 @@ ${PYSITELIB}/salt/modules/win_path.pyo
${PYSITELIB}/salt/modules/win_pkg.py
${PYSITELIB}/salt/modules/win_pkg.pyc
${PYSITELIB}/salt/modules/win_pkg.pyo
+${PYSITELIB}/salt/modules/win_pki.py
+${PYSITELIB}/salt/modules/win_pki.pyc
+${PYSITELIB}/salt/modules/win_pki.pyo
${PYSITELIB}/salt/modules/win_powercfg.py
${PYSITELIB}/salt/modules/win_powercfg.pyc
${PYSITELIB}/salt/modules/win_powercfg.pyo
+${PYSITELIB}/salt/modules/win_psget.py
+${PYSITELIB}/salt/modules/win_psget.pyc
+${PYSITELIB}/salt/modules/win_psget.pyo
${PYSITELIB}/salt/modules/win_repo.py
${PYSITELIB}/salt/modules/win_repo.pyc
${PYSITELIB}/salt/modules/win_repo.pyo
@@ -1694,6 +1835,12 @@ ${PYSITELIB}/salt/modules/win_service.pyo
${PYSITELIB}/salt/modules/win_shadow.py
${PYSITELIB}/salt/modules/win_shadow.pyc
${PYSITELIB}/salt/modules/win_shadow.pyo
+${PYSITELIB}/salt/modules/win_smtp_server.py
+${PYSITELIB}/salt/modules/win_smtp_server.pyc
+${PYSITELIB}/salt/modules/win_smtp_server.pyo
+${PYSITELIB}/salt/modules/win_snmp.py
+${PYSITELIB}/salt/modules/win_snmp.pyc
+${PYSITELIB}/salt/modules/win_snmp.pyo
${PYSITELIB}/salt/modules/win_status.py
${PYSITELIB}/salt/modules/win_status.pyc
${PYSITELIB}/salt/modules/win_status.pyo
@@ -1721,6 +1868,9 @@ ${PYSITELIB}/salt/modules/x509.pyo
${PYSITELIB}/salt/modules/xapi.py
${PYSITELIB}/salt/modules/xapi.pyc
${PYSITELIB}/salt/modules/xapi.pyo
+${PYSITELIB}/salt/modules/xbpspkg.py
+${PYSITELIB}/salt/modules/xbpspkg.pyc
+${PYSITELIB}/salt/modules/xbpspkg.pyo
${PYSITELIB}/salt/modules/xfs.py
${PYSITELIB}/salt/modules/xfs.pyc
${PYSITELIB}/salt/modules/xfs.pyo
@@ -1793,9 +1943,6 @@ ${PYSITELIB}/salt/netapi/rest_wsgi.pyo
${PYSITELIB}/salt/output/__init__.py
${PYSITELIB}/salt/output/__init__.pyc
${PYSITELIB}/salt/output/__init__.pyo
-${PYSITELIB}/salt/output/compact.py
-${PYSITELIB}/salt/output/compact.pyc
-${PYSITELIB}/salt/output/compact.pyo
${PYSITELIB}/salt/output/highstate.py
${PYSITELIB}/salt/output/highstate.pyc
${PYSITELIB}/salt/output/highstate.pyo
@@ -1820,6 +1967,9 @@ ${PYSITELIB}/salt/output/no_return.pyo
${PYSITELIB}/salt/output/overstatestage.py
${PYSITELIB}/salt/output/overstatestage.pyc
${PYSITELIB}/salt/output/overstatestage.pyo
+${PYSITELIB}/salt/output/pony.py
+${PYSITELIB}/salt/output/pony.pyc
+${PYSITELIB}/salt/output/pony.pyo
${PYSITELIB}/salt/output/pprint_out.py
${PYSITELIB}/salt/output/pprint_out.pyc
${PYSITELIB}/salt/output/pprint_out.pyo
@@ -1856,9 +2006,15 @@ ${PYSITELIB}/salt/pillar/cmd_yamlex.pyo
${PYSITELIB}/salt/pillar/cobbler.py
${PYSITELIB}/salt/pillar/cobbler.pyc
${PYSITELIB}/salt/pillar/cobbler.pyo
+${PYSITELIB}/salt/pillar/confidant.py
+${PYSITELIB}/salt/pillar/confidant.pyc
+${PYSITELIB}/salt/pillar/confidant.pyo
${PYSITELIB}/salt/pillar/consul_pillar.py
${PYSITELIB}/salt/pillar/consul_pillar.pyc
${PYSITELIB}/salt/pillar/consul_pillar.pyo
+${PYSITELIB}/salt/pillar/csvpillar.py
+${PYSITELIB}/salt/pillar/csvpillar.pyc
+${PYSITELIB}/salt/pillar/csvpillar.pyo
${PYSITELIB}/salt/pillar/django_orm.py
${PYSITELIB}/salt/pillar/django_orm.pyc
${PYSITELIB}/salt/pillar/django_orm.pyo
@@ -1883,12 +2039,18 @@ ${PYSITELIB}/salt/pillar/hg_pillar.pyo
${PYSITELIB}/salt/pillar/hiera.py
${PYSITELIB}/salt/pillar/hiera.pyc
${PYSITELIB}/salt/pillar/hiera.pyo
+${PYSITELIB}/salt/pillar/http_json.py
+${PYSITELIB}/salt/pillar/http_json.pyc
+${PYSITELIB}/salt/pillar/http_json.pyo
${PYSITELIB}/salt/pillar/http_yaml.py
${PYSITELIB}/salt/pillar/http_yaml.pyc
${PYSITELIB}/salt/pillar/http_yaml.pyo
${PYSITELIB}/salt/pillar/libvirt.py
${PYSITELIB}/salt/pillar/libvirt.pyc
${PYSITELIB}/salt/pillar/libvirt.pyo
+${PYSITELIB}/salt/pillar/makostack.py
+${PYSITELIB}/salt/pillar/makostack.pyc
+${PYSITELIB}/salt/pillar/makostack.pyo
${PYSITELIB}/salt/pillar/mongo.py
${PYSITELIB}/salt/pillar/mongo.pyc
${PYSITELIB}/salt/pillar/mongo.pyo
@@ -1898,6 +2060,9 @@ ${PYSITELIB}/salt/pillar/mysql.pyo
${PYSITELIB}/salt/pillar/neutron.py
${PYSITELIB}/salt/pillar/neutron.pyc
${PYSITELIB}/salt/pillar/neutron.pyo
+${PYSITELIB}/salt/pillar/nodegroups.py
+${PYSITELIB}/salt/pillar/nodegroups.pyc
+${PYSITELIB}/salt/pillar/nodegroups.pyo
${PYSITELIB}/salt/pillar/pepa.py
${PYSITELIB}/salt/pillar/pepa.pyc
${PYSITELIB}/salt/pillar/pepa.pyo
@@ -1934,6 +2099,9 @@ ${PYSITELIB}/salt/pillar/svn_pillar.pyo
${PYSITELIB}/salt/pillar/varstack_pillar.py
${PYSITELIB}/salt/pillar/varstack_pillar.pyc
${PYSITELIB}/salt/pillar/varstack_pillar.pyo
+${PYSITELIB}/salt/pillar/vault.py
+${PYSITELIB}/salt/pillar/vault.pyc
+${PYSITELIB}/salt/pillar/vault.pyo
${PYSITELIB}/salt/pillar/virtkey.py
${PYSITELIB}/salt/pillar/virtkey.pyc
${PYSITELIB}/salt/pillar/virtkey.pyo
@@ -1943,6 +2111,9 @@ ${PYSITELIB}/salt/proxy/__init__.pyo
${PYSITELIB}/salt/proxy/chronos.py
${PYSITELIB}/salt/proxy/chronos.pyc
${PYSITELIB}/salt/proxy/chronos.pyo
+${PYSITELIB}/salt/proxy/cisconso.py
+${PYSITELIB}/salt/proxy/cisconso.pyc
+${PYSITELIB}/salt/proxy/cisconso.pyo
${PYSITELIB}/salt/proxy/esxi.py
${PYSITELIB}/salt/proxy/esxi.pyc
${PYSITELIB}/salt/proxy/esxi.pyo
@@ -1955,6 +2126,12 @@ ${PYSITELIB}/salt/proxy/junos.pyo
${PYSITELIB}/salt/proxy/marathon.py
${PYSITELIB}/salt/proxy/marathon.pyc
${PYSITELIB}/salt/proxy/marathon.pyo
+${PYSITELIB}/salt/proxy/napalm.py
+${PYSITELIB}/salt/proxy/napalm.pyc
+${PYSITELIB}/salt/proxy/napalm.pyo
+${PYSITELIB}/salt/proxy/nxos.py
+${PYSITELIB}/salt/proxy/nxos.pyc
+${PYSITELIB}/salt/proxy/nxos.pyo
${PYSITELIB}/salt/proxy/philips_hue.py
${PYSITELIB}/salt/proxy/philips_hue.pyc
${PYSITELIB}/salt/proxy/philips_hue.pyo
@@ -1979,6 +2156,9 @@ ${PYSITELIB}/salt/renderers/__init__.pyo
${PYSITELIB}/salt/renderers/cheetah.py
${PYSITELIB}/salt/renderers/cheetah.pyc
${PYSITELIB}/salt/renderers/cheetah.pyo
+${PYSITELIB}/salt/renderers/dson.py
+${PYSITELIB}/salt/renderers/dson.pyc
+${PYSITELIB}/salt/renderers/dson.pyo
${PYSITELIB}/salt/renderers/genshi.py
${PYSITELIB}/salt/renderers/genshi.pyc
${PYSITELIB}/salt/renderers/genshi.pyo
@@ -2099,6 +2279,9 @@ ${PYSITELIB}/salt/returners/postgres_local_cache.pyo
${PYSITELIB}/salt/returners/pushover_returner.py
${PYSITELIB}/salt/returners/pushover_returner.pyc
${PYSITELIB}/salt/returners/pushover_returner.pyo
+${PYSITELIB}/salt/returners/rawfile_json.py
+${PYSITELIB}/salt/returners/rawfile_json.pyc
+${PYSITELIB}/salt/returners/rawfile_json.pyo
${PYSITELIB}/salt/returners/redis_return.py
${PYSITELIB}/salt/returners/redis_return.pyc
${PYSITELIB}/salt/returners/redis_return.pyo
@@ -2114,6 +2297,9 @@ ${PYSITELIB}/salt/returners/sms_return.pyo
${PYSITELIB}/salt/returners/smtp_return.py
${PYSITELIB}/salt/returners/smtp_return.pyc
${PYSITELIB}/salt/returners/smtp_return.pyo
+${PYSITELIB}/salt/returners/splunk.py
+${PYSITELIB}/salt/returners/splunk.pyc
+${PYSITELIB}/salt/returners/splunk.pyo
${PYSITELIB}/salt/returners/sqlite3_return.py
${PYSITELIB}/salt/returners/sqlite3_return.pyc
${PYSITELIB}/salt/returners/sqlite3_return.pyo
@@ -2123,6 +2309,9 @@ ${PYSITELIB}/salt/returners/syslog_return.pyo
${PYSITELIB}/salt/returners/xmpp_return.py
${PYSITELIB}/salt/returners/xmpp_return.pyc
${PYSITELIB}/salt/returners/xmpp_return.pyo
+${PYSITELIB}/salt/returners/zabbix_return.py
+${PYSITELIB}/salt/returners/zabbix_return.pyc
+${PYSITELIB}/salt/returners/zabbix_return.pyo
${PYSITELIB}/salt/roster/__init__.py
${PYSITELIB}/salt/roster/__init__.pyc
${PYSITELIB}/salt/roster/__init__.pyo
@@ -2156,6 +2345,9 @@ ${PYSITELIB}/salt/runners/__init__.pyo
${PYSITELIB}/salt/runners/asam.py
${PYSITELIB}/salt/runners/asam.pyc
${PYSITELIB}/salt/runners/asam.pyo
+${PYSITELIB}/salt/runners/auth.py
+${PYSITELIB}/salt/runners/auth.pyc
+${PYSITELIB}/salt/runners/auth.pyo
${PYSITELIB}/salt/runners/cache.py
${PYSITELIB}/salt/runners/cache.pyc
${PYSITELIB}/salt/runners/cache.pyo
@@ -2174,6 +2366,9 @@ ${PYSITELIB}/salt/runners/drac.pyo
${PYSITELIB}/salt/runners/error.py
${PYSITELIB}/salt/runners/error.pyc
${PYSITELIB}/salt/runners/error.pyo
+${PYSITELIB}/salt/runners/event.py
+${PYSITELIB}/salt/runners/event.pyc
+${PYSITELIB}/salt/runners/event.pyo
${PYSITELIB}/salt/runners/f5.py
${PYSITELIB}/salt/runners/f5.pyc
${PYSITELIB}/salt/runners/f5.pyo
@@ -2222,6 +2417,9 @@ ${PYSITELIB}/salt/runners/queue.pyo
${PYSITELIB}/salt/runners/reactor.py
${PYSITELIB}/salt/runners/reactor.pyc
${PYSITELIB}/salt/runners/reactor.pyo
+${PYSITELIB}/salt/runners/salt.py
+${PYSITELIB}/salt/runners/salt.pyc
+${PYSITELIB}/salt/runners/salt.pyo
${PYSITELIB}/salt/runners/saltutil.py
${PYSITELIB}/salt/runners/saltutil.pyc
${PYSITELIB}/salt/runners/saltutil.pyo
@@ -2231,6 +2429,9 @@ ${PYSITELIB}/salt/runners/sdb.pyo
${PYSITELIB}/salt/runners/search.py
${PYSITELIB}/salt/runners/search.pyc
${PYSITELIB}/salt/runners/search.pyo
+${PYSITELIB}/salt/runners/smartos_vmadm.py
+${PYSITELIB}/salt/runners/smartos_vmadm.pyc
+${PYSITELIB}/salt/runners/smartos_vmadm.pyo
${PYSITELIB}/salt/runners/spacewalk.py
${PYSITELIB}/salt/runners/spacewalk.pyc
${PYSITELIB}/salt/runners/spacewalk.pyo
@@ -2252,6 +2453,9 @@ ${PYSITELIB}/salt/runners/thin.pyo
${PYSITELIB}/salt/runners/virt.py
${PYSITELIB}/salt/runners/virt.pyc
${PYSITELIB}/salt/runners/virt.pyo
+${PYSITELIB}/salt/runners/vistara.py
+${PYSITELIB}/salt/runners/vistara.pyc
+${PYSITELIB}/salt/runners/vistara.pyo
${PYSITELIB}/salt/runners/winrepo.py
${PYSITELIB}/salt/runners/winrepo.pyc
${PYSITELIB}/salt/runners/winrepo.pyo
@@ -2261,9 +2465,18 @@ ${PYSITELIB}/salt/scripts.pyo
${PYSITELIB}/salt/sdb/__init__.py
${PYSITELIB}/salt/sdb/__init__.pyc
${PYSITELIB}/salt/sdb/__init__.pyo
+${PYSITELIB}/salt/sdb/confidant.py
+${PYSITELIB}/salt/sdb/confidant.pyc
+${PYSITELIB}/salt/sdb/confidant.pyo
+${PYSITELIB}/salt/sdb/consul.py
+${PYSITELIB}/salt/sdb/consul.pyc
+${PYSITELIB}/salt/sdb/consul.pyo
${PYSITELIB}/salt/sdb/couchdb.py
${PYSITELIB}/salt/sdb/couchdb.pyc
${PYSITELIB}/salt/sdb/couchdb.pyo
+${PYSITELIB}/salt/sdb/env.py
+${PYSITELIB}/salt/sdb/env.pyc
+${PYSITELIB}/salt/sdb/env.pyo
${PYSITELIB}/salt/sdb/etcd_db.py
${PYSITELIB}/salt/sdb/etcd_db.pyc
${PYSITELIB}/salt/sdb/etcd_db.pyo
@@ -2279,6 +2492,9 @@ ${PYSITELIB}/salt/sdb/rest.pyo
${PYSITELIB}/salt/sdb/sqlite3.py
${PYSITELIB}/salt/sdb/sqlite3.pyc
${PYSITELIB}/salt/sdb/sqlite3.pyo
+${PYSITELIB}/salt/sdb/vault.py
+${PYSITELIB}/salt/sdb/vault.pyc
+${PYSITELIB}/salt/sdb/vault.pyo
${PYSITELIB}/salt/search/__init__.py
${PYSITELIB}/salt/search/__init__.pyc
${PYSITELIB}/salt/search/__init__.pyo
@@ -2327,6 +2543,9 @@ ${PYSITELIB}/salt/state.pyo
${PYSITELIB}/salt/states/__init__.py
${PYSITELIB}/salt/states/__init__.pyc
${PYSITELIB}/salt/states/__init__.pyo
+${PYSITELIB}/salt/states/acme.py
+${PYSITELIB}/salt/states/acme.pyc
+${PYSITELIB}/salt/states/acme.pyo
${PYSITELIB}/salt/states/alias.py
${PYSITELIB}/salt/states/alias.pyc
${PYSITELIB}/salt/states/alias.pyo
@@ -2372,6 +2591,9 @@ ${PYSITELIB}/salt/states/bigip.pyo
${PYSITELIB}/salt/states/blockdev.py
${PYSITELIB}/salt/states/blockdev.pyc
${PYSITELIB}/salt/states/blockdev.pyo
+${PYSITELIB}/salt/states/boto_apigateway.py
+${PYSITELIB}/salt/states/boto_apigateway.pyc
+${PYSITELIB}/salt/states/boto_apigateway.pyo
${PYSITELIB}/salt/states/boto_asg.py
${PYSITELIB}/salt/states/boto_asg.pyc
${PYSITELIB}/salt/states/boto_asg.pyo
@@ -2384,6 +2606,12 @@ ${PYSITELIB}/salt/states/boto_cloudtrail.pyo
${PYSITELIB}/salt/states/boto_cloudwatch_alarm.py
${PYSITELIB}/salt/states/boto_cloudwatch_alarm.pyc
${PYSITELIB}/salt/states/boto_cloudwatch_alarm.pyo
+${PYSITELIB}/salt/states/boto_cloudwatch_event.py
+${PYSITELIB}/salt/states/boto_cloudwatch_event.pyc
+${PYSITELIB}/salt/states/boto_cloudwatch_event.pyo
+${PYSITELIB}/salt/states/boto_cognitoidentity.py
+${PYSITELIB}/salt/states/boto_cognitoidentity.pyc
+${PYSITELIB}/salt/states/boto_cognitoidentity.pyo
${PYSITELIB}/salt/states/boto_datapipeline.py
${PYSITELIB}/salt/states/boto_datapipeline.pyc
${PYSITELIB}/salt/states/boto_datapipeline.pyo
@@ -2396,6 +2624,9 @@ ${PYSITELIB}/salt/states/boto_ec2.pyo
${PYSITELIB}/salt/states/boto_elasticache.py
${PYSITELIB}/salt/states/boto_elasticache.pyc
${PYSITELIB}/salt/states/boto_elasticache.pyo
+${PYSITELIB}/salt/states/boto_elasticsearch_domain.py
+${PYSITELIB}/salt/states/boto_elasticsearch_domain.pyc
+${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
@@ -2444,6 +2675,9 @@ ${PYSITELIB}/salt/states/bower.pyo
${PYSITELIB}/salt/states/cabal.py
${PYSITELIB}/salt/states/cabal.pyc
${PYSITELIB}/salt/states/cabal.pyo
+${PYSITELIB}/salt/states/ceph.py
+${PYSITELIB}/salt/states/ceph.pyc
+${PYSITELIB}/salt/states/ceph.pyo
${PYSITELIB}/salt/states/chef.py
${PYSITELIB}/salt/states/chef.pyc
${PYSITELIB}/salt/states/chef.pyo
@@ -2453,6 +2687,9 @@ ${PYSITELIB}/salt/states/chocolatey.pyo
${PYSITELIB}/salt/states/chronos_job.py
${PYSITELIB}/salt/states/chronos_job.pyc
${PYSITELIB}/salt/states/chronos_job.pyo
+${PYSITELIB}/salt/states/cisconso.py
+${PYSITELIB}/salt/states/cisconso.pyc
+${PYSITELIB}/salt/states/cisconso.pyo
${PYSITELIB}/salt/states/cloud.py
${PYSITELIB}/salt/states/cloud.pyc
${PYSITELIB}/salt/states/cloud.pyo
@@ -2465,6 +2702,9 @@ ${PYSITELIB}/salt/states/composer.pyo
${PYSITELIB}/salt/states/cron.py
${PYSITELIB}/salt/states/cron.pyc
${PYSITELIB}/salt/states/cron.pyo
+${PYSITELIB}/salt/states/csf.py
+${PYSITELIB}/salt/states/csf.pyc
+${PYSITELIB}/salt/states/csf.pyo
${PYSITELIB}/salt/states/cyg.py
${PYSITELIB}/salt/states/cyg.pyc
${PYSITELIB}/salt/states/cyg.pyo
@@ -2507,6 +2747,9 @@ ${PYSITELIB}/salt/states/esxi.pyo
${PYSITELIB}/salt/states/etcd_mod.py
${PYSITELIB}/salt/states/etcd_mod.pyc
${PYSITELIB}/salt/states/etcd_mod.pyo
+${PYSITELIB}/salt/states/ethtool.py
+${PYSITELIB}/salt/states/ethtool.pyc
+${PYSITELIB}/salt/states/ethtool.pyo
${PYSITELIB}/salt/states/event.py
${PYSITELIB}/salt/states/event.pyc
${PYSITELIB}/salt/states/event.pyo
@@ -2576,6 +2819,12 @@ ${PYSITELIB}/salt/states/ifttt.pyo
${PYSITELIB}/salt/states/incron.py
${PYSITELIB}/salt/states/incron.pyc
${PYSITELIB}/salt/states/incron.pyo
+${PYSITELIB}/salt/states/influxdb08_database.py
+${PYSITELIB}/salt/states/influxdb08_database.pyc
+${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_database.py
${PYSITELIB}/salt/states/influxdb_database.pyc
${PYSITELIB}/salt/states/influxdb_database.pyo
@@ -2603,9 +2852,15 @@ ${PYSITELIB}/salt/states/jboss7.pyo
${PYSITELIB}/salt/states/jenkins.py
${PYSITELIB}/salt/states/jenkins.pyc
${PYSITELIB}/salt/states/jenkins.pyo
+${PYSITELIB}/salt/states/junos.py
+${PYSITELIB}/salt/states/junos.pyc
+${PYSITELIB}/salt/states/junos.pyo
${PYSITELIB}/salt/states/k8s.py
${PYSITELIB}/salt/states/k8s.pyc
${PYSITELIB}/salt/states/k8s.pyo
+${PYSITELIB}/salt/states/kapacitor.py
+${PYSITELIB}/salt/states/kapacitor.pyc
+${PYSITELIB}/salt/states/kapacitor.pyo
${PYSITELIB}/salt/states/keyboard.py
${PYSITELIB}/salt/states/keyboard.pyc
${PYSITELIB}/salt/states/keyboard.pyo
@@ -2621,6 +2876,9 @@ ${PYSITELIB}/salt/states/layman.pyo
${PYSITELIB}/salt/states/ldap.py
${PYSITELIB}/salt/states/ldap.pyc
${PYSITELIB}/salt/states/ldap.pyo
+${PYSITELIB}/salt/states/libcloud_dns.py
+${PYSITELIB}/salt/states/libcloud_dns.pyc
+${PYSITELIB}/salt/states/libcloud_dns.pyo
${PYSITELIB}/salt/states/linux_acl.py
${PYSITELIB}/salt/states/linux_acl.pyc
${PYSITELIB}/salt/states/linux_acl.pyo
@@ -2648,6 +2906,9 @@ ${PYSITELIB}/salt/states/mac_defaults.pyo
${PYSITELIB}/salt/states/mac_keychain.py
${PYSITELIB}/salt/states/mac_keychain.pyc
${PYSITELIB}/salt/states/mac_keychain.pyo
+${PYSITELIB}/salt/states/mac_package.py
+${PYSITELIB}/salt/states/mac_package.pyc
+${PYSITELIB}/salt/states/mac_package.pyo
${PYSITELIB}/salt/states/mac_xattr.py
${PYSITELIB}/salt/states/mac_xattr.pyc
${PYSITELIB}/salt/states/mac_xattr.pyo
@@ -2696,6 +2957,15 @@ ${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/netntp.py
+${PYSITELIB}/salt/states/netntp.pyc
+${PYSITELIB}/salt/states/netntp.pyo
+${PYSITELIB}/salt/states/netsnmp.py
+${PYSITELIB}/salt/states/netsnmp.pyc
+${PYSITELIB}/salt/states/netsnmp.pyo
+${PYSITELIB}/salt/states/netusers.py
+${PYSITELIB}/salt/states/netusers.pyc
+${PYSITELIB}/salt/states/netusers.pyo
${PYSITELIB}/salt/states/network.py
${PYSITELIB}/salt/states/network.pyc
${PYSITELIB}/salt/states/network.pyo
@@ -2708,6 +2978,9 @@ ${PYSITELIB}/salt/states/npm.pyo
${PYSITELIB}/salt/states/ntp.py
${PYSITELIB}/salt/states/ntp.pyc
${PYSITELIB}/salt/states/ntp.pyo
+${PYSITELIB}/salt/states/nxos.py
+${PYSITELIB}/salt/states/nxos.pyc
+${PYSITELIB}/salt/states/nxos.pyo
${PYSITELIB}/salt/states/openstack_config.py
${PYSITELIB}/salt/states/openstack_config.pyc
${PYSITELIB}/salt/states/openstack_config.pyo
@@ -2732,6 +3005,9 @@ ${PYSITELIB}/salt/states/pagerduty_service.pyo
${PYSITELIB}/salt/states/pagerduty_user.py
${PYSITELIB}/salt/states/pagerduty_user.pyc
${PYSITELIB}/salt/states/pagerduty_user.pyo
+${PYSITELIB}/salt/states/pcs.py
+${PYSITELIB}/salt/states/pcs.pyc
+${PYSITELIB}/salt/states/pcs.pyo
${PYSITELIB}/salt/states/pecl.py
${PYSITELIB}/salt/states/pecl.pyc
${PYSITELIB}/salt/states/pecl.pyo
@@ -2789,6 +3065,9 @@ ${PYSITELIB}/salt/states/postgres_user.pyo
${PYSITELIB}/salt/states/powerpath.py
${PYSITELIB}/salt/states/powerpath.pyc
${PYSITELIB}/salt/states/powerpath.pyo
+${PYSITELIB}/salt/states/probes.py
+${PYSITELIB}/salt/states/probes.pyc
+${PYSITELIB}/salt/states/probes.pyo
${PYSITELIB}/salt/states/process.py
${PYSITELIB}/salt/states/process.pyc
${PYSITELIB}/salt/states/process.pyo
@@ -2867,6 +3146,9 @@ ${PYSITELIB}/salt/states/smartos.pyo
${PYSITELIB}/salt/states/smtp.py
${PYSITELIB}/salt/states/smtp.pyc
${PYSITELIB}/salt/states/smtp.pyo
+${PYSITELIB}/salt/states/snapper.py
+${PYSITELIB}/salt/states/snapper.pyc
+${PYSITELIB}/salt/states/snapper.pyo
${PYSITELIB}/salt/states/splunk.py
${PYSITELIB}/salt/states/splunk.pyc
${PYSITELIB}/salt/states/splunk.pyo
@@ -2912,6 +3194,9 @@ ${PYSITELIB}/salt/states/telemetry_alert.pyo
${PYSITELIB}/salt/states/test.py
${PYSITELIB}/salt/states/test.pyc
${PYSITELIB}/salt/states/test.pyo
+${PYSITELIB}/salt/states/testinframod.py
+${PYSITELIB}/salt/states/testinframod.pyc
+${PYSITELIB}/salt/states/testinframod.pyo
${PYSITELIB}/salt/states/timezone.py
${PYSITELIB}/salt/states/timezone.pyc
${PYSITELIB}/salt/states/timezone.pyo
@@ -2963,6 +3248,9 @@ ${PYSITELIB}/salt/states/win_firewall.pyo
${PYSITELIB}/salt/states/win_iis.py
${PYSITELIB}/salt/states/win_iis.pyc
${PYSITELIB}/salt/states/win_iis.pyo
+${PYSITELIB}/salt/states/win_lgpo.py
+${PYSITELIB}/salt/states/win_lgpo.pyc
+${PYSITELIB}/salt/states/win_lgpo.pyo
${PYSITELIB}/salt/states/win_license.py
${PYSITELIB}/salt/states/win_license.pyc
${PYSITELIB}/salt/states/win_license.pyo
@@ -2972,12 +3260,21 @@ ${PYSITELIB}/salt/states/win_network.pyo
${PYSITELIB}/salt/states/win_path.py
${PYSITELIB}/salt/states/win_path.pyc
${PYSITELIB}/salt/states/win_path.pyo
+${PYSITELIB}/salt/states/win_pki.py
+${PYSITELIB}/salt/states/win_pki.pyc
+${PYSITELIB}/salt/states/win_pki.pyo
${PYSITELIB}/salt/states/win_powercfg.py
${PYSITELIB}/salt/states/win_powercfg.pyc
${PYSITELIB}/salt/states/win_powercfg.pyo
${PYSITELIB}/salt/states/win_servermanager.py
${PYSITELIB}/salt/states/win_servermanager.pyc
${PYSITELIB}/salt/states/win_servermanager.pyo
+${PYSITELIB}/salt/states/win_smtp_server.py
+${PYSITELIB}/salt/states/win_smtp_server.pyc
+${PYSITELIB}/salt/states/win_smtp_server.pyo
+${PYSITELIB}/salt/states/win_snmp.py
+${PYSITELIB}/salt/states/win_snmp.pyc
+${PYSITELIB}/salt/states/win_snmp.pyo
${PYSITELIB}/salt/states/win_system.py
${PYSITELIB}/salt/states/win_system.pyc
${PYSITELIB}/salt/states/win_system.pyo
@@ -3054,21 +3351,36 @@ ${PYSITELIB}/salt/textformat.pyo
${PYSITELIB}/salt/thorium/__init__.py
${PYSITELIB}/salt/thorium/__init__.pyc
${PYSITELIB}/salt/thorium/__init__.pyo
+${PYSITELIB}/salt/thorium/calc.py
+${PYSITELIB}/salt/thorium/calc.pyc
+${PYSITELIB}/salt/thorium/calc.pyo
${PYSITELIB}/salt/thorium/check.py
${PYSITELIB}/salt/thorium/check.pyc
${PYSITELIB}/salt/thorium/check.pyo
${PYSITELIB}/salt/thorium/file.py
${PYSITELIB}/salt/thorium/file.pyc
${PYSITELIB}/salt/thorium/file.pyo
+${PYSITELIB}/salt/thorium/key.py
+${PYSITELIB}/salt/thorium/key.pyc
+${PYSITELIB}/salt/thorium/key.pyo
${PYSITELIB}/salt/thorium/local.py
${PYSITELIB}/salt/thorium/local.pyc
${PYSITELIB}/salt/thorium/local.pyo
${PYSITELIB}/salt/thorium/reg.py
${PYSITELIB}/salt/thorium/reg.pyc
${PYSITELIB}/salt/thorium/reg.pyo
+${PYSITELIB}/salt/thorium/runner.py
+${PYSITELIB}/salt/thorium/runner.pyc
+${PYSITELIB}/salt/thorium/runner.pyo
+${PYSITELIB}/salt/thorium/status.py
+${PYSITELIB}/salt/thorium/status.pyc
+${PYSITELIB}/salt/thorium/status.pyo
${PYSITELIB}/salt/thorium/timer.py
${PYSITELIB}/salt/thorium/timer.pyc
${PYSITELIB}/salt/thorium/timer.pyo
+${PYSITELIB}/salt/thorium/wheel.py
+${PYSITELIB}/salt/thorium/wheel.pyc
+${PYSITELIB}/salt/thorium/wheel.pyo
${PYSITELIB}/salt/tops/__init__.py
${PYSITELIB}/salt/tops/__init__.pyc
${PYSITELIB}/salt/tops/__init__.pyo
@@ -3084,6 +3396,9 @@ ${PYSITELIB}/salt/tops/mongo.pyo
${PYSITELIB}/salt/tops/reclass_adapter.py
${PYSITELIB}/salt/tops/reclass_adapter.pyc
${PYSITELIB}/salt/tops/reclass_adapter.pyo
+${PYSITELIB}/salt/tops/varstack.py
+${PYSITELIB}/salt/tops/varstack.pyc
+${PYSITELIB}/salt/tops/varstack.pyo
${PYSITELIB}/salt/transport/__init__.py
${PYSITELIB}/salt/transport/__init__.pyc
${PYSITELIB}/salt/transport/__init__.pyo
@@ -3174,6 +3489,9 @@ ${PYSITELIB}/salt/utils/dicttrim.pyo
${PYSITELIB}/salt/utils/dictupdate.py
${PYSITELIB}/salt/utils/dictupdate.pyc
${PYSITELIB}/salt/utils/dictupdate.pyo
+${PYSITELIB}/salt/utils/dns.py
+${PYSITELIB}/salt/utils/dns.pyc
+${PYSITELIB}/salt/utils/dns.pyo
${PYSITELIB}/salt/utils/doc.py
${PYSITELIB}/salt/utils/doc.pyc
${PYSITELIB}/salt/utils/doc.pyo
@@ -3186,6 +3504,9 @@ ${PYSITELIB}/salt/utils/etcd_util.pyo
${PYSITELIB}/salt/utils/event.py
${PYSITELIB}/salt/utils/event.pyc
${PYSITELIB}/salt/utils/event.pyo
+${PYSITELIB}/salt/utils/extend.py
+${PYSITELIB}/salt/utils/extend.pyc
+${PYSITELIB}/salt/utils/extend.pyo
${PYSITELIB}/salt/utils/extmods.py
${PYSITELIB}/salt/utils/extmods.pyc
${PYSITELIB}/salt/utils/extmods.pyo
@@ -3309,6 +3630,9 @@ ${PYSITELIB}/salt/utils/pkg/__init__.pyo
${PYSITELIB}/salt/utils/pkg/rpm.py
${PYSITELIB}/salt/utils/pkg/rpm.pyc
${PYSITELIB}/salt/utils/pkg/rpm.pyo
+${PYSITELIB}/salt/utils/powershell.py
+${PYSITELIB}/salt/utils/powershell.pyc
+${PYSITELIB}/salt/utils/powershell.pyo
${PYSITELIB}/salt/utils/preseed.py
${PYSITELIB}/salt/utils/preseed.pyc
${PYSITELIB}/salt/utils/preseed.pyo
@@ -3351,6 +3675,9 @@ ${PYSITELIB}/salt/utils/s3.pyo
${PYSITELIB}/salt/utils/saltminionservice.py
${PYSITELIB}/salt/utils/saltminionservice.pyc
${PYSITELIB}/salt/utils/saltminionservice.pyo
+${PYSITELIB}/salt/utils/sanitizers.py
+${PYSITELIB}/salt/utils/sanitizers.pyc
+${PYSITELIB}/salt/utils/sanitizers.pyo
${PYSITELIB}/salt/utils/schedule.py
${PYSITELIB}/salt/utils/schedule.pyc
${PYSITELIB}/salt/utils/schedule.pyo
@@ -3384,6 +3711,9 @@ ${PYSITELIB}/salt/utils/thin.pyo
${PYSITELIB}/salt/utils/timed_subprocess.py
${PYSITELIB}/salt/utils/timed_subprocess.pyc
${PYSITELIB}/salt/utils/timed_subprocess.pyo
+${PYSITELIB}/salt/utils/timeout.py
+${PYSITELIB}/salt/utils/timeout.pyc
+${PYSITELIB}/salt/utils/timeout.pyo
${PYSITELIB}/salt/utils/url.py
${PYSITELIB}/salt/utils/url.pyc
${PYSITELIB}/salt/utils/url.pyo
@@ -3399,12 +3729,18 @@ ${PYSITELIB}/salt/utils/validate/path.pyo
${PYSITELIB}/salt/utils/validate/user.py
${PYSITELIB}/salt/utils/validate/user.pyc
${PYSITELIB}/salt/utils/validate/user.pyo
+${PYSITELIB}/salt/utils/vault.py
+${PYSITELIB}/salt/utils/vault.pyc
+${PYSITELIB}/salt/utils/vault.pyo
${PYSITELIB}/salt/utils/verify.py
${PYSITELIB}/salt/utils/verify.pyc
${PYSITELIB}/salt/utils/verify.pyo
${PYSITELIB}/salt/utils/virt.py
${PYSITELIB}/salt/utils/virt.pyc
${PYSITELIB}/salt/utils/virt.pyo
+${PYSITELIB}/salt/utils/virtualbox.py
+${PYSITELIB}/salt/utils/virtualbox.pyc
+${PYSITELIB}/salt/utils/virtualbox.pyo
${PYSITELIB}/salt/utils/vmware.py
${PYSITELIB}/salt/utils/vmware.pyc
${PYSITELIB}/salt/utils/vmware.pyo
@@ -3414,6 +3750,12 @@ ${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_functions.py
+${PYSITELIB}/salt/utils/win_functions.pyc
+${PYSITELIB}/salt/utils/win_functions.pyo
+${PYSITELIB}/salt/utils/win_osinfo.py
+${PYSITELIB}/salt/utils/win_osinfo.pyc
+${PYSITELIB}/salt/utils/win_osinfo.pyo
${PYSITELIB}/salt/utils/win_runas.py
${PYSITELIB}/salt/utils/win_runas.pyc
${PYSITELIB}/salt/utils/win_runas.pyo
@@ -3480,6 +3822,7 @@ man/man1/salt-run.1
man/man1/salt-ssh.1
man/man1/salt-syndic.1
man/man1/salt-unity.1
+man/man1/salt.1
man/man1/spm.1
man/man7/salt.7
share/examples/salt/master
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index 03adcb69e78..bcffb1eb547 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.22 2016/09/19 13:34:37 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2017/02/03 13:39:00 sborrill Exp $
-SHA1 (salt-2016.3.3.tar.gz) = 9c52a7401c0600cc422ccaa2406909bd6ac71db0
-RMD160 (salt-2016.3.3.tar.gz) = 66f5b1615d59d200f82184a142a1a0597fe877ff
-SHA512 (salt-2016.3.3.tar.gz) = 46a8f8b3213e4cc02eaed95e7fc28ce224fe07fe2aea39b68ff3e97043021951558f04690f7043510c8dfb62d76fe82192d67de6151c7f1076a23c0f8d796c9e
-Size (salt-2016.3.3.tar.gz) = 7952361 bytes
-SHA1 (patch-salt_modules_status.py) = 4b2bec94a8554c656baa227ad973b71d2a56d48d
-SHA1 (patch-salt_utils_____init____.py) = 61f11da63f26af69334f3eca957d596486396ab0
-SHA1 (patch-salt_utils_network.py) = 13db1609939b8e8390656904af86ba92408bb44a
+SHA1 (salt-2016.11.2.tar.gz) = 00cc3ad1af9e40e4cfa2572c45058e3342944413
+RMD160 (salt-2016.11.2.tar.gz) = cd6b75fb78e9bf52116c05866682a49cb96f67d2
+SHA512 (salt-2016.11.2.tar.gz) = 0dbc861424643af664edd2d9cb8bcbde7e9bcf7c1d202a5e844af83c21dc2d75fd7034db27dffc58dc2a6e47cfe2ea2c42e2a9af867c7ca78f93166eb4fd03ad
+Size (salt-2016.11.2.tar.gz) = 9114042 bytes
diff --git a/sysutils/salt/patches/patch-salt_modules_status.py b/sysutils/salt/patches/patch-salt_modules_status.py
deleted file mode 100644
index 257a77da779..00000000000
--- a/sysutils/salt/patches/patch-salt_modules_status.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-salt_modules_status.py,v 1.3 2016/09/19 13:34:37 jperkin Exp $
-
-Avoid a crash in "status.diskusage" when not on Linux or FreeBSD
-
---- salt/modules/status.py.orig 2016-08-26 18:55:37.000000000 +0000
-+++ salt/modules/status.py
-@@ -603,6 +603,8 @@ def diskusage(*args):
- ifile = __salt__['cmd.run']('mount -p').splitlines()
- elif __grains__['kernel'] == 'SunOS':
- ifile = __salt__['cmd.run']('mount -p').splitlines()
-+ else:
-+ ifile = []
-
- for line in ifile:
- comps = line.split()
diff --git a/sysutils/salt/patches/patch-salt_utils_____init____.py b/sysutils/salt/patches/patch-salt_utils_____init____.py
deleted file mode 100644
index b7bb7d2f8cb..00000000000
--- a/sysutils/salt/patches/patch-salt_utils_____init____.py
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-salt_utils_____init____.py,v 1.1 2016/02/16 01:52:34 khorben Exp $
-
-Use sockstat(1) on NetBSD
-
---- salt/utils/__init__.py.orig 2016-02-01 19:40:31.000000000 +0000
-+++ salt/utils/__init__.py
-@@ -1664,6 +1664,14 @@ def is_freebsd():
-
-
- @real_memoize
-+def is_netbsd():
-+ '''
-+ Simple function to return if host is NetBSD or not
-+ '''
-+ return sys.platform.startswith('netbsd')
-+
-+
-+@real_memoize
- def is_openbsd():
- '''
- Simple function to return if host is OpenBSD or not
diff --git a/sysutils/salt/patches/patch-salt_utils_network.py b/sysutils/salt/patches/patch-salt_utils_network.py
deleted file mode 100644
index ec5ed422ca3..00000000000
--- a/sysutils/salt/patches/patch-salt_utils_network.py
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-salt_utils_network.py,v 1.3 2016/09/19 13:34:37 jperkin Exp $
-
-Use sockstat(1) on NetBSD
-
---- salt/utils/network.py.orig 2016-08-26 18:55:37.000000000 +0000
-+++ salt/utils/network.py
-@@ -1086,6 +1086,8 @@ def _remotes_on(port, which_end):
- return _sunos_remotes_on(port, which_end)
- if salt.utils.is_freebsd():
- return _freebsd_remotes_on(port, which_end)
-+ if salt.utils.is_netbsd():
-+ return _netbsd_remotes_on(port, which_end)
- if salt.utils.is_openbsd():
- return _openbsd_remotes_on(port, which_end)
- if salt.utils.is_windows():
-@@ -1208,6 +1210,65 @@ def _freebsd_remotes_on(port, which_end)
- return remotes
-
-
-+def _netbsd_remotes_on(port, which_end):
-+ '''
-+ Returns set of ipv4 host addresses of remote established connections
-+ on local tcp port port.
-+
-+ Parses output of shell 'sockstat' (FreeBSD)
-+ to get connections
-+
-+ $ sudo sockstat -4
-+ USER COMMAND PID FD PROTO LOCAL ADDRESS FOREIGN ADDRESS
-+ root python2.7 1456 29 tcp4 *.4505 *.*
-+ root python2.7 1445 17 tcp4 *.4506 *.*
-+ root python2.7 1294 14 tcp4 127.0.0.1.11813 127.0.0.1.4505
-+ root python2.7 1294 41 tcp4 127.0.0.1.61115 127.0.0.1.4506
-+
-+ $ sudo sockstat -4 -c -p 4506
-+ USER COMMAND PID FD PROTO LOCAL ADDRESS FOREIGN ADDRESS
-+ root python2.7 1294 41 tcp4 127.0.0.1.61115 127.0.0.1.4506
-+ '''
-+
-+ port = int(port)
-+ remotes = set()
-+
-+ try:
-+ cmd = shlex.split('sockstat -4 -c -p {0}'.format(port))
-+ data = subprocess.check_output(cmd) # pylint: disable=minimum-python-version
-+ except subprocess.CalledProcessError as ex:
-+ log.error('Failed "sockstat" with returncode = {0}'.format(ex.returncode))
-+ raise
-+
-+ lines = salt.utils.to_str(data).split('\n')
-+
-+ for line in lines:
-+ chunks = line.split()
-+ if not chunks:
-+ continue
-+ # ['root', 'python2.7', '1456', '37', 'tcp4',
-+ # '127.0.0.1.4505-', '127.0.0.1.55703']
-+ #print chunks
-+ if 'COMMAND' in chunks[1]:
-+ continue # ignore header
-+ if len(chunks) < 2:
-+ continue
-+ local = chunks[5].split('.')
-+ lport = local.pop()
-+ lhost = '.'.join(local)
-+ remote = chunks[6].split('.')
-+ rport = remote.pop()
-+ rhost = '.'.join(remote)
-+ if which_end == 'local' and int(lport) != port: # ignore if local port not port
-+ continue
-+ if which_end == 'remote' and int(rport) != port: # ignore if remote port not port
-+ continue
-+
-+ remotes.add(rhost)
-+
-+ return remotes
-+
-+
- def _openbsd_remotes_on(port, which_end):
- '''
- OpenBSD specific helper function.