From 0249634dd861ced0c07fbf8b3a5190b5b8af9b58 Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Wed, 12 Aug 2020 20:33:43 +0800
Subject: [PATCH 1/2] cherry pick #3635 to release-3.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
---
 tiflash/tiflash-configuration.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md
index 2f56db2189343..089bcb4513702 100644
--- a/tiflash/tiflash-configuration.md
+++ b/tiflash/tiflash-configuration.md
@@ -18,7 +18,19 @@ You can adjust the PD scheduling parameters using [pd-ctl](/pd-control.md) (the
     >
     > The value of this parameter should be less than that of `region-schedule-limit`. Otherwise, the normal Region scheduling among TiKV nodes is affected.
 
+<<<<<<< HEAD
 - [`store-balance-rate`](/pd-configuration-file.md#store-balance-rate): limits the rate at which each store is scheduled.
+=======
+- [`store-balance-rate`](/pd-configuration-file.md#store-balance-rate): limits the rate at which Regions of each TiKV/TiFlash store are scheduled. Note that this parameter takes effect only when the stores have newly joined the cluster. If you want to change the setting for existing stores, use the following command.
+
+    > **Note:**
+    >
+    > Since v4.0.2, the `store-balance-rate` parameter has been deprecated and changes have been made to the `store limit` command. See [store-limit](/configure-store-limit.md) for details.
+
+    - Execute the `pd-ctl -u <pd_ip:pd_port> store limit <store_id> <value>` command to set the scheduling rate of a specified store. (To get `store_id`, you can execute the `pd-ctl -u <pd_ip:pd_port> store` command. 
+    - If you do not set the scheduling rate for Regions of a specified store, this store inherits the setting of `store-balance-rate`. 
+    - You can execute the `pd-ctl -u <pd_ip:pd_port> store limit` command to view the current setting value of `store-balance-rate`.
+>>>>>>> a4f5067... add tiflash store limit config version change note (#3635)
 
 ## TiFlash configuration parameters
 

From b43ba242ee0eb7604b3c0cb7066ade8a79181d8d Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Wed, 12 Aug 2020 21:27:36 +0800
Subject: [PATCH 2/2] Update tiflash-configuration.md

---
 tiflash/tiflash-configuration.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md
index 089bcb4513702..b20e27c7ec542 100644
--- a/tiflash/tiflash-configuration.md
+++ b/tiflash/tiflash-configuration.md
@@ -18,19 +18,15 @@ You can adjust the PD scheduling parameters using [pd-ctl](/pd-control.md) (the
     >
     > The value of this parameter should be less than that of `region-schedule-limit`. Otherwise, the normal Region scheduling among TiKV nodes is affected.
 
-<<<<<<< HEAD
-- [`store-balance-rate`](/pd-configuration-file.md#store-balance-rate): limits the rate at which each store is scheduled.
-=======
 - [`store-balance-rate`](/pd-configuration-file.md#store-balance-rate): limits the rate at which Regions of each TiKV/TiFlash store are scheduled. Note that this parameter takes effect only when the stores have newly joined the cluster. If you want to change the setting for existing stores, use the following command.
 
     > **Note:**
     >
     > Since v4.0.2, the `store-balance-rate` parameter has been deprecated and changes have been made to the `store limit` command. See [store-limit](/configure-store-limit.md) for details.
 
-    - Execute the `pd-ctl -u <pd_ip:pd_port> store limit <store_id> <value>` command to set the scheduling rate of a specified store. (To get `store_id`, you can execute the `pd-ctl -u <pd_ip:pd_port> store` command. 
-    - If you do not set the scheduling rate for Regions of a specified store, this store inherits the setting of `store-balance-rate`. 
+    - Execute the `pd-ctl -u <pd_ip:pd_port> store limit <store_id> <value>` command to set the scheduling rate of a specified store. (To get `store_id`, you can execute the `pd-ctl -u <pd_ip:pd_port> store` command.
+    - If you do not set the scheduling rate for Regions of a specified store, this store inherits the setting of `store-balance-rate`.
     - You can execute the `pd-ctl -u <pd_ip:pd_port> store limit` command to view the current setting value of `store-balance-rate`.
->>>>>>> a4f5067... add tiflash store limit config version change note (#3635)
 
 ## TiFlash configuration parameters