Merge branch 'master' into mf-master

.ci/kitchen-centos7-py2-cloud

@@ -11,6 +11,7 @@ def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def use_spot_instances = true
 def jenkins_slave_label = 'kitchen-slave'
+def kitchen_platforms_file = '/var/jenkins/workspace/nox-cloud-platforms.yml'
 
 properties([
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')),
@@ -30,6 +31,7 @@ runTests(
     testrun_timeout: testrun_timeout,
     run_full: params.runFull,
     use_spot_instances: use_spot_instances,
-    jenkins_slave_label: jenkins_slave_label)
+    jenkins_slave_label: jenkins_slave_label,
+    kitchen_platforms_file: kitchen_platforms_file)
 
 // vim: ft=groovy

.ci/kitchen-centos7-py3-cloud

@@ -11,6 +11,7 @@ def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def use_spot_instances = true
 def jenkins_slave_label = 'kitchen-slave'
+def kitchen_platforms_file = '/var/jenkins/workspace/nox-cloud-platforms.yml'
 
 properties([
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')),
@@ -30,6 +31,7 @@ runTests(
     testrun_timeout: testrun_timeout,
     run_full: params.runFull,
     use_spot_instances: use_spot_instances,
-    jenkins_slave_label: jenkins_slave_label)
+    jenkins_slave_label: jenkins_slave_label,
+    kitchen_platforms_file: kitchen_platforms_file)
 
 // vim: ft=groovy

.ci/kitchen-fedora31-py3

@@ -0,0 +1,48 @@
+@Library('salt@master-1.3') _
+
+// Define the maximum time, in hours, that a test run should run for
+def testrun_timeout = 6
+
+def distro_name = 'fedora'
+def distro_version = '31'
+def python_version = 'py3'
+def nox_env_name = 'runtests-zeromq'
+def golden_images_branch = 'master'
+def nox_passthrough_opts = '--ssh-tests'
+def concurrent_builds = 1
+def use_spot_instances = true
+def jenkins_slave_label = 'kitchen-slave'
+
+properties([
+    buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')),
+    parameters([
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
+    ])
+])
+
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
+}
+
+runTests(
+    env: env,
+    distro_name: distro_name,
+    distro_version: distro_version,
+    python_version: python_version,
+    golden_images_branch: golden_images_branch,
+    nox_env_name: nox_env_name,
+    nox_passthrough_opts: nox_passthrough_opts,
+    testrun_timeout: testrun_timeout,
+    run_full: params.runFull,
+    use_spot_instances: use_spot_instances,
+    jenkins_slave_label: jenkins_slave_label)
+
+// vim: ft=groovy

doc/ref/engines/all/index.rst

@@ -11,7 +11,6 @@ engine modules
     :template: autosummary.rst.tmpl
 
     docker_events
-    hipchat
     http_logstash
     ircbot
     junos_syslog

doc/ref/modules/all/index.rst

@@ -171,7 +171,6 @@ execution modules
     hashutil
     heat
     hg
-    hipchat
     hosts
     http
     ifttt

doc/ref/modules/index.rst

@@ -298,7 +298,7 @@ prevent loading if dependencies are not met.
 
 Since ``__virtual__`` is called before the module is loaded, ``__salt__`` will
 be unreliable as not all modules will be available at this point in time. The
-``__pillar`` and ``__grains__`` :ref:`"dunder" dictionaries <dunder-dictionaries>`
+``__pillar__`` and ``__grains__`` :ref:`"dunder" dictionaries <dunder-dictionaries>`
 are available however.
 
 .. note::

doc/ref/returners/all/index.rst

@@ -19,7 +19,6 @@ returner modules
     elasticsearch_return
     etcd_return
     highstate_return
-    hipchat_return
     influxdb_return
     kafka_return
     librato_return

doc/ref/states/all/index.rst

@@ -115,7 +115,6 @@ state modules
     group
     heat
     hg
-    hipchat
     host
     http
     icinga2

doc/topics/development/modules/index.rst

@@ -83,7 +83,7 @@ Sync Via the saltutil Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The saltutil module has a number of functions that can be used to sync all
-or specific dynamic modules. The ``saltutil.sync_*`` 
+or specific dynamic modules. The ``saltutil.sync_*``
 :py:mod:`execution functions <salt.modules.saltutil>` and
 :py:mod:`runner functions <salt.runners.saltutil>` can be used to sync modules
 to minions and the master, respectively.
@@ -120,7 +120,7 @@ This is done via setuptools entry points:
     )
 
 Note that these are not synced from the Salt Master to the Minions. They must be
-installed indepdendently on each Minion.
+installed independently on each Minion.
 
 Module Types
 ============
@@ -139,7 +139,7 @@ Cache        ``salt.cache`` (:ref:`index <all-salt.cache>`)                   ``
 Cloud        ``salt.cloud.clouds`` (:ref:`index <all-salt.clouds>`)           ``clouds``                ``cloud_dirs``
 Engine       ``salt.engines`` (:ref:`index <engines>`)                        ``engines``               ``engines_dirs``
 Execution    ``salt.modules`` (:ref:`index <all-salt.modules>`)               ``modules``               ``module_dirs``
-Executor     ``salt.executors`` (:ref:`index <all-salt.executors>`)           ``executors`` [#no-fs]_   ``executor_dirs``
+Executor     ``salt.executors`` (:ref:`index <all-salt.executors>`)           ``executors``             ``executor_dirs``
 File Server  ``salt.fileserver`` (:ref:`index <file-server>`)                 ``fileserver``            ``fileserver_dirs``
 Grain        ``salt.grains`` (:ref:`index <all-salt.grains>`)                 ``grains``                ``grains_dirs``
 Log Handler  ``salt.log.handlers`` (:ref:`index <external-logging-handlers>`) ``log_handlers``          ``log_handlers_dirs``

doc/topics/grains/index.rst

@@ -63,8 +63,7 @@ Just add the option :conf_minion:`grains` and pass options to it:
       cab_u: 14-15
 
 Then status data specific to your servers can be retrieved via Salt, or used
-inside of the State system for matching. It also makes targeting, in the case
-of the example above, simply based on specific data about your deployment.
+inside of the State system for matching. It also makes it possible to target based on specific data about your deployment, as in the example above.
 
 
 Grains in /etc/salt/grains
@@ -292,7 +291,7 @@ the Salt minion and provides the principal example of how to write grains:
 Syncing Grains
 ==============
 
-Syncing grains can be done a number of ways, they are automatically synced when
+Syncing grains can be done a number of ways. They are automatically synced when
 :mod:`state.highstate <salt.modules.state.highstate>` is called, or (as noted
 above) the grains can be manually synced and reloaded by calling the
 :mod:`saltutil.sync_grains <salt.modules.saltutil.sync_grains>` or

doc/topics/index.rst

@@ -9,13 +9,13 @@ The 30 second summary
 
 Salt is:
 
-* a configuration management system, capable of maintaining remote nodes
-  in defined states (for example, ensuring that specific packages are installed and
-  specific services are running)
+* **A configuration management system.** Salt is capable of maintaining remote
+  nodes in defined states. For example, it can ensure that specific packages are
+  installed and that specific services are running.
 
-* a distributed remote execution system used to execute commands and
-  query data on remote nodes, either individually or by arbitrary
-  selection criteria
+* **A distributed remote execution system used to execute commands and
+  query data on remote nodes.** Salt can query and execute commands either on
+  individual nodes or by using an arbitrary selection criteria.
 
 It was developed in order to bring the best solutions found in the
 world of remote execution together and make them better, faster, and more
@@ -188,4 +188,3 @@ documentation efforts, please review the :ref:`contributing documentation
 <contributing>`!
 
 .. _`Apache 2.0 license`: http://www.apache.org/licenses/LICENSE-2.0.html
-

doc/topics/releases/neon.rst

@@ -4,7 +4,6 @@
 Salt Release Notes - Codename Neon
 ==================================
 
-
 Slot Syntax Updates
 ===================
 
@@ -30,3 +29,35 @@ The slot syntax has been updated to support parsing dictionary responses and to
      Started: 09:59:58.623575
     Duration: 1.229 ms
      Changes:
+
+Deprecations
+============
+
+Module Deprecations
+-------------------
+
+- The hipchat module has been removed due to the service being retired.
+  :py:func:`Google Chat <salt.modules.google_chat>`,
+  :py:func:`MS Teams <salt.modules.msteams>`, or
+  :py:func:`Slack <salt.modules.slack_notify>` may be suitable replacements.
+
+
+State Deprecations
+------------------
+
+- The hipchat state has been removed due to the service being retired.
+  :py:func:`MS Teams <salt.states.msteams>` or
+  :py:func:`Slack <salt.states.slack>` may be suitable replacements.
+
+Engine Removal
+--------------
+
+- The hipchat engine has been removed due to the service being retired. For users migrating
+  to Slack, the :py:func:`slack <salt.engines.slack>` engine may be a suitable replacement.
+
+Returner Removal
+----------------
+
+- The hipchat returner has been removed due to the service being retired. For users migrating
+  to Slack, the :py:func:`slack <salt.returners.slack_returner>` returner may be a suitable
+  replacement.

salt/beacons/inotify.py

@@ -117,6 +117,10 @@ def validate(config):
         if 'files' not in _config:
             return False, 'Configuration for inotify beacon must include files.'
         else:
+            if not isinstance(_config['files'], dict):
+                return False, ('Configuration for inotify beacon invalid, '
+                               'files must be a dict.')
+
             for path in _config.get('files'):
 
                 if not isinstance(_config['files'][path], dict):