From 36f216cb7cb16958d98b3d77e121198596fd2213 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 19 Jun 2017 08:44:04 -0700
Subject: PLT-6080 moving clustering to memberlist (#6499)

* PLT-6080 adding cluster discovery service

* Adding memberlist lib

* Adding memberlist lib

* WIP

* WIP

* WIP

* WIP

* Rolling back config changes

* Fixing make file

* Fixing config for cluster

* WIP

* Fixing system console for clustering

* Fixing default config

* Fixing config

* Fixing system console for clustering

* Tweaking hub setting

* Bumping up time

* merging vendor dir

* Updating vendor dir

* Fixing unit test

* Fixing bad merge

* Remove some testing code

* Moving comment

* PLT-6868 adding db ping retry

* Removing unused loc strings

* Adding defer to cancel
---
 i18n/en.json | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 188b5526b..3fec5d17f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3261,7 +3261,7 @@
   },
   {
     "id": "ent.cluster.config_changed.info",
-    "translation": "Cluster configuration has changed for id=%v.  Attempting to restart cluster service.  To ensure the cluster is configured correctly you should not rely on this restart because we detected a core configuration change."
+    "translation": "Cluster configuration has changed for id={{ .id }}.  The cluster may become unstable and a restart is required.  To ensure the cluster is configured correctly you should perform a rolling restart immediately."
   },
   {
     "id": "ent.cluster.debug_fail.debug",
@@ -3293,7 +3293,7 @@
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "System Console is set to read-only when High Availability is enabled."
+    "translation": "System Console is set to read-only when High Availability is enabled  unless ReadOnlyConfig is disabled in the configuration file."
   },
   {
     "id": "ent.cluster.starting.info",
@@ -4711,14 +4711,6 @@
     "id": "store.sql.open_conn.panic",
     "translation": "Failed to open SQL connection %v"
   },
-  {
-    "id": "store.sql.ping.critical",
-    "translation": "Failed to ping DB err:%v"
-  },
-  {
-    "id": "store.sql.pinging.info",
-    "translation": "Pinging SQL %v database"
-  },
   {
     "id": "store.sql.read_replicas_not_licensed.critical",
     "translation": "More than 1 read replica functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
-- 
cgit v1.2.3-1-g7c22