Merge branch 'develop' into 8875-pillar-relative-includes

HACKING.rst

@@ -250,9 +250,9 @@ If it is less than 2047, you should increase it with::
 Running the tests
 ~~~~~~~~~~~~~~~~~
 
-For running tests, you'll also need to install ``requirements/dev_python2x.txt``::
+For running tests, you'll also need to install ``requirements/dev_python27.txt``::
 
-    pip install -r requirements/dev_python2x.txt
+    pip install -r requirements/dev_python27.txt
 
 Finally you use setup.py to run the tests with the following command::
 

doc/ref/modules/all/index.rst

@@ -29,7 +29,7 @@ execution modules
     apache
     apcups
     apf
-    apk
+    apkpkg
     aptpkg
     archive
     arista_pyeapi
@@ -43,7 +43,7 @@ execution modules
     beacons
     bigip
     bluecoat_sslv
-    bluez
+    bluez_bluetooth
     boto3_elasticache
     boto3_route53
     boto_apigateway
@@ -108,7 +108,7 @@ execution modules
     ddns
     deb_apache
     deb_postgres
-    debbuild
+    debuild_pkgbuild
     debconfmod
     debian_ip
     debian_service
@@ -121,13 +121,13 @@ execution modules
     dnsutil
     dockercompose
     dockermod
-    dpkg
+    dpkg_lowpkg
     drac
     dracr
     drbd
-    dummyproxy_package
+    dummyproxy_pkg
     dummyproxy_service
-    ebuild
+    ebuildpkg
     eix
     elasticsearch
     environ
@@ -170,14 +170,13 @@ execution modules
     hg
     hipchat
     hosts
-    htpasswd
     http
     ifttt
     ilo
     icinga2
     incron
-    influx
-    influx08
+    influxdbmod
+    influxdb08mod
     infoblox
     ini_manage
     inspectlib
@@ -212,7 +211,7 @@ execution modules
     keystoneng
     kmod
     kubernetes
-    launchctl
+    launchctl_service
     layman
     ldap3
     ldapmod
@@ -233,14 +232,14 @@ execution modules
     lxc
     lxd
     mac_assistive
-    mac_brew
-    mac_defaults
+    mac_brew_pkg
+    macdefaults
     mac_desktop
     mac_group
     mac_keychain
-    mac_package
+    macpackage
     mac_pkgutil
-    mac_ports
+    mac_portspkg
     mac_power
     mac_service
     mac_shadow
@@ -255,7 +254,7 @@ execution modules
     marathon
     match
     mattermost
-    mdadm
+    mdadm_raid
     mdata
     memcached
     mine
@@ -273,12 +272,13 @@ execution modules
     nacl
     nagios
     nagios_rpc
-    namecheap_dns
+    namecheap_domains_dns
     namecheap_domains
-    namecheap_ns
+    namecheap_domains_ns
     namecheap_ssl
     namecheap_users
-    napalm_acl
+    napalm_mod
+    napalm_netacl
     napalm_bgp
     napalm_formula
     napalm_mod
@@ -311,7 +311,7 @@ execution modules
     omapi
     openbsd_sysctl
     openbsdpkg
-    openbsdrcctl
+    openbsdrcctl_service
     openbsdservice
     openscap
     openstack_config
@@ -322,13 +322,13 @@ execution modules
     oracle
     osquery
     out
-    pacman
+    pacmanpkg
     pagerduty
     pagerduty_util
     pam
     panos
     parallels
-    parted
+    parted_partition
     pcs
     pdbedit
     pecl
@@ -368,16 +368,16 @@ execution modules
     rdp
     redismod
     reg
-    rest_package
+    rest_pkg
     rest_sample_utils
     rest_service
     restartcheck
     ret
     rh_ip
     rh_service
     riak
-    rpm
-    rpmbuild
+    rpm_lowpkg
+    rpmbuild_pkgbuild
     rsync
     runit
     rvm
@@ -406,22 +406,22 @@ execution modules
     smartos_virt
     smartos_vmadm
     smbios
-    smf
+    smf_service
     smtp
     solaris_fmadm
     solaris_group
     solaris_shadow
     solaris_system
     solaris_user
-    solarisips
+    solarisipspkg
     solarispkg
     solr
     solrcloud
     splunk
     splunk_search
     sqlite3
     ssh
-    ssh_package
+    ssh_pkg
     ssh_service
     snap
     snapper
@@ -440,7 +440,7 @@ execution modules
     sysrc
     system
     system_profiler
-    systemd
+    systemd_service
     telegram
     telemetry
     temp
@@ -456,7 +456,7 @@ execution modules
     tuned
     twilio_notify
     udev
-    upstart
+    upstart_service
     uptime
     useradd
     uwsgi
@@ -470,6 +470,7 @@ execution modules
     virtualenv_mod
     vmctl
     vsphere
+    webutil
     win_autoruns
     win_certutil
     win_dacl
@@ -491,7 +492,7 @@ execution modules
     win_pki
     win_powercfg
     win_psget
-    win_repo
+    winrepo
     win_servermanager
     win_service
     win_shadow
@@ -504,7 +505,7 @@ execution modules
     win_useradd
     win_wua
     x509
-    xapi
+    xapi_virt
     xbpspkg
     xfs
     xmpp
@@ -519,4 +520,4 @@ execution modules
     zonecfg
     zookeeper
     zpool
-    zypper
+    zypperpkg

doc/ref/modules/all/salt.modules.apkpkg.rst

@@ -0,0 +1,7 @@
+===================
+salt.modules.apkpkg
+===================
+
+.. automodule:: salt.modules.apkpkg
+    :members:
+    :undoc-members:

doc/ref/modules/all/salt.modules.bluez_bluetooth.rst

@@ -0,0 +1,6 @@
+============================
+salt.modules.bluez_bluetooth
+============================
+
+.. automodule:: salt.modules.bluez_bluetooth
+    :members:

doc/ref/modules/all/salt.modules.napalm_acl.rst → doc/ref/modules/all/salt.modules.debuild_pkgbuild.rst

@@ -1,7 +1,6 @@
 ==============================
-salt.modules.napalm_acl module
+salt.modules.debuild_pkgbuild
 ==============================
 
-.. automodule:: salt.modules.napalm_acl
+.. automodule:: salt.modules.debuild_pkgbuild
     :members:
-

doc/ref/modules/all/salt.modules.dpkg_lowpkg.rst

@@ -0,0 +1,6 @@
+========================
+salt.modules.dpkg_lowpkg
+========================
+
+.. automodule:: salt.modules.dpkg_lowpkg
+    :members:

doc/ref/modules/all/salt.modules.dummyproxy_pkg.rst

@@ -0,0 +1,7 @@
+==================================
+salt.modules.dummyproxy_pkg module
+==================================
+
+.. automodule:: salt.modules.dummyproxy_pkg
+    :members:
+    :undoc-members:

doc/ref/modules/all/salt.modules.ebuildpkg.rst

@@ -0,0 +1,7 @@
+======================
+salt.modules.ebuildpkg
+======================
+
+.. automodule:: salt.modules.ebuildpkg
+    :members:
+    :exclude-members: available_version

doc/ref/modules/all/salt.modules.influxdb08mod.rst

@@ -0,0 +1,7 @@
+==========================
+salt.modules.influxdb08mod
+==========================
+
+.. automodule:: salt.modules.influxdb08mod
+    :members:
+    :undoc-members:

doc/ref/modules/all/salt.modules.influxdbmod.rst

@@ -0,0 +1,6 @@
+========================
+salt.modules.influxdbmod
+========================
+
+.. automodule:: salt.modules.influxdbmod
+    :members:

doc/ref/modules/all/salt.modules.launchctl_service.rst

@@ -0,0 +1,6 @@
+==============================
+salt.modules.launchctl_service
+==============================
+
+.. automodule:: salt.modules.launchctl_service
+    :members: