From 8c2282f89e6c439044afe98eb61f806d5a3215b5 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Tue, 28 Jun 2016 14:53:36 -0400
Subject: PLT-3191 E20: Updates to Reload Configuration from Disk and Recycle
 Database Connections  (#3424)

* added help text to reload configuration and recycle db

* Update reload_config.jsx

* Update en.json
---
 webapp/components/admin_console/recycle_db.jsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'webapp/components/admin_console/recycle_db.jsx')

diff --git a/webapp/components/admin_console/recycle_db.jsx b/webapp/components/admin_console/recycle_db.jsx
index c863fccd2..e421711e7 100644
--- a/webapp/components/admin_console/recycle_db.jsx
+++ b/webapp/components/admin_console/recycle_db.jsx
@@ -6,7 +6,7 @@ import React from 'react';
 import Client from 'utils/web_client.jsx';
 import * as Utils from 'utils/utils.jsx';
 
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
 
 export default class RecycleDbButton extends React.Component {
     constructor(props) {
@@ -64,6 +64,13 @@ export default class RecycleDbButton extends React.Component {
             );
         }
 
+        let helpText = (
+            <FormattedHTMLMessage
+                id='admin.recycle.recycleDescription'
+                defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired confugration and using the <a href="../general/configuration"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.'
+            />
+        );
+
         let contents = null;
         if (this.state.loading) {
             contents = (
@@ -93,6 +100,9 @@ export default class RecycleDbButton extends React.Component {
                         </button>
                         {testMessage}
                     </div>
+                    <div className='help-text'>
+                        {helpText}
+                    </div>
                 </div>
             </div>
         );
-- 
cgit v1.2.3-1-g7c22