Apply suggestions from code review

pingcap · Jul 5, 2021 · f991543 · f991543
1 parent 51979fa
commit f991543
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/releases/release-5.1.0.md b/releases/release-5.1.0.md
@@ -134,13 +134,6 @@ In v5.1, the key new features or improvements are as follows:
 
 + Stale read of data replicas (Experimental)
 
-<<<<<<< HEAD
-    Read local replicas data directly to reduce read latency and improve the query performance [User document](/stale-read.md), [#21094](https://github.com/pingcap/tidb/issues/21094)
-
-+ Enable the Hibernate Region feature by default.
-
-    If a Region is in an inactive state for a long time, it is automatically set to a silent state, which reduces the system overhead of the heartbeat information between the Leader and the Follower. [User document](/tikv-configuration-file.md#hibernate-regions), [#10266](https://github.com/tikv/tikv/pull/10266)
-=======
     Read local replicas data directly to reduce read latency and improve the query performance
 
     [User document](/stale-read.md), [#21094](https://github.com/pingcap/tidb/issues/21094)
@@ -150,7 +143,6 @@ In v5.1, the key new features or improvements are as follows:
     If a Region is in an inactive state for a long time, it is automatically set to a silent state, which reduces the system overhead of the heartbeat information between the Leader and the Follower.
 
     [User document](/tikv-configuration-file.md#hibernate-regions), [#10266](https://github.com/tikv/tikv/pull/10266)
->>>>>>> ab1502536 (release-5.1.0: update CTE description (#5918))
 
 ### Stability
 
@@ -160,11 +152,6 @@ In v5.1, the key new features or improvements are as follows:
     - If large amounts of data is accumulated during the replication interruption, exceeding 1TB, the re-replication causes OOM problems.
     - Large amounts of data writes cause OOM problems in TiCDC.
     - Reduce the possibility of  TiCDC replication interruption in the following scenarios:
-<<<<<<< HEAD
-
-=======
-
->>>>>>> ab1502536 (release-5.1.0: update CTE description (#5918))
         [project#11](https://github.com/pingcap/ticdc/projects/11)
 
         - Replication interruption when the network is unstable
@@ -176,13 +163,9 @@ In v5.1, the key new features or improvements are as follows:
 
 + Add a write rate limiter for TiKV background tasks (TiKV Write Rate Limiter)
 
-<<<<<<< HEAD
-    To ensure the duration stability of read and write requests, TiKV Write Rate Limiter smoothes the write traffic of TiKV background tasks such as GC and Compaction. The default value of TiKV background task write rate limiter is "0MB". It is recommended to set this value to the optimal I/O bandwidth of the disk, such as the maximum I/O bandwidth specified by the cloud disk manufacturer. [User document](/tikv-configuration-file.md#storageio-rate-limit), [#9156](https://github.com/tikv/tikv/issues/9156)
-=======
     To ensure the duration stability of read and write requests, TiKV Write Rate Limiter smoothes the write traffic of TiKV background tasks such as GC and Compaction. The default value of TiKV background task write rate limiter is "0MB". It is recommended to set this value to the optimal I/O bandwidth of the disk, such as the maximum I/O bandwidth specified by the cloud disk manufacturer.
 
     [User document](/tikv-configuration-file.md#storageio-rate-limit), [#9156](https://github.com/tikv/tikv/issues/9156)
->>>>>>> ab1502536 (release-5.1.0: update CTE description (#5918))
 
 + Solve scheduling stability issues when multiple scaling tasks are performed at the same time