From 4b9f85b1cf395f0364ed1adb32710f95feabe148 Mon Sep 17 00:00:00 2001
From: melissaml <ma.lei@99cloud.net>
Date: Fri, 7 Dec 2018 19:13:48 +0800
Subject: [PATCH] Change openstack-dev to openstack-discuss

Mailinglists have been updated. Openstack-discuss replaces openstack-dev.

Change-Id: I344b909e1930737ee8710a69e05fdc0c7f021dfa
---
 doc/source/_templates/openstackrally/layout.html | 2 +-
 doc/source/overview/glossary.rst                 | 2 +-
 doc/source/project_info/index.rst                | 2 +-
 etc/docker/motd                                  | 3 ++-
 install_rally.sh                                 | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/source/_templates/openstackrally/layout.html b/doc/source/_templates/openstackrally/layout.html
index ef819316bd..69418e11a4 100644
--- a/doc/source/_templates/openstackrally/layout.html
+++ b/doc/source/_templates/openstackrally/layout.html
@@ -20,7 +20,7 @@
     <h3>Contacts</h3>
     <p class="topless" style="color: black">
         <b>IRC</b> <br /><a href="ircs://irc.freenode.net:6697/#openstack-rally">#openstack-rally</a> channel at FreeNode<br />
-        <b>E-mail</b> <br /><a href="mailto:openstack-dev@lists.openstack.org?subject=[Rally]">openstack-dev@lists.openstack.org</a> with "[Rally]" tag in subject
+        <b>E-mail</b> <br /><a href="mailto:openstack-discuss@lists.openstack.org?subject=[Rally]">openstack-discuss@lists.openstack.org</a> with "[Rally]" tag in subject
     </p>
     <h3>Useful links</h3>
     <ul>
diff --git a/doc/source/overview/glossary.rst b/doc/source/overview/glossary.rst
index 96d77c2068..cd60639314 100644
--- a/doc/source/overview/glossary.rst
+++ b/doc/source/overview/glossary.rst
@@ -10,7 +10,7 @@ Glossary
   team is working on improving it.  If you cannot find a definition in
   which you are interested, feel free to ping us via IRC
   (#openstack-rally channel at Freenode) or via E-Mail
-  (openstack-dev@lists.openstack.org with tag [Rally]).
+  (openstack-discuss@lists.openstack.org with tag [Rally]).
 
 .. contents::
   :depth: 1
diff --git a/doc/source/project_info/index.rst b/doc/source/project_info/index.rst
index cabee31426..b8ac8fd175 100644
--- a/doc/source/project_info/index.rst
+++ b/doc/source/project_info/index.rst
@@ -152,7 +152,7 @@ Where can I discuss and propose changes?
 - Our IRC channel: **#openstack-rally** on **irc.freenode.net**;
 - Weekly Rally team meeting (in IRC): **#openstack-meeting** on
   **irc.freenode.net**, held on Mondays at 14:00 UTC;
-- OpenStack mailing list: **openstack-dev@lists.openstack.org** (see
+- OpenStack mailing list: **openstack-discuss@lists.openstack.org** (see
   `subscription and usage instructions`_);
 - `Rally team on Launchpad`_: Answers/Bugs/Blueprints.
 
diff --git a/etc/docker/motd b/etc/docker/motd
index 12979f527b..37355b093b 100644
--- a/etc/docker/motd
+++ b/etc/docker/motd
@@ -13,7 +13,8 @@
 #  Rally at readthedocs - http://rally.readthedocs.org                        #
 #  How to contribute - http://rally.readthedocs.org/en/latest/contribute.html #
 #  If you have any questions, you can reach the Rally team by:                #
-#    * e-mail - openstack-dev@lists.openstack.org with tag [Rally] in subject #
+#    * e-mail - openstack-discuss@lists.openstack.org with tag [Rally] in     #
+#      subject                                                                #
 #    * Gitter - https://gitter.im/xRally/Lobby room                           #
 #    * irc - "#openstack-rally" channel at freenode.net                       #
 ###############################################################################
diff --git a/install_rally.sh b/install_rally.sh
index c9a7f13f52..f740884162 100755
--- a/install_rally.sh
+++ b/install_rally.sh
@@ -109,7 +109,7 @@ __EOF__
 
 If the above does not help you resolve the issue, please contact the
 Rally team by sending an email to the OpenStack mailing list
-openstack-dev@lists.openstack.org. Include the full output of this
+openstack-discuss@lists.openstack.org. Include the full output of this
 script to help us identifying the problem.
 $RED
 Aborting installation!$NO_COLOR