Merge pull request #54983 from mchugh19/port-51949

master-port 51949 and 51996
saltstack · Nov 14, 2019 · d44951c · d44951c
2 parents b9a52de + 5337072
commit d44951c
Showing 15 changed files with 32 additions and 1,525 deletions.
diff --git a/doc/ref/engines/all/index.rst b/doc/ref/engines/all/index.rst
@@ -11,7 +11,6 @@ engine modules
     :template: autosummary.rst.tmpl
 
     docker_events
-    hipchat
     http_logstash
     ircbot
     junos_syslog

diff --git a/doc/ref/engines/all/salt.engines.hipchat.rst b/doc/ref/engines/all/salt.engines.hipchat.rst
diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst
@@ -171,7 +171,6 @@ execution modules
     hashutil
     heat
     hg
-    hipchat
     hosts
     http
     ifttt

diff --git a/doc/ref/modules/all/salt.modules.hipchat.rst b/doc/ref/modules/all/salt.modules.hipchat.rst
diff --git a/doc/ref/returners/all/index.rst b/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

diff --git a/doc/ref/returners/all/salt.returners.hipchat_return.rst b/doc/ref/returners/all/salt.returners.hipchat_return.rst
diff --git a/doc/ref/states/all/index.rst b/doc/ref/states/all/index.rst
@@ -115,7 +115,6 @@ state modules
     group
     heat
     hg
-    hipchat
     host
     http
     icinga2

diff --git a/doc/ref/states/all/salt.states.hipchat.rst b/doc/ref/states/all/salt.states.hipchat.rst
diff --git a/doc/topics/releases/neon.rst b/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.
-Original file line number
+Diff line change
@@ @@ -171,7 +171,6 @@ execution modules @@
         hashutil
         heat
         hg
-        hipchat
         hosts
         http
         ifttt