From 4ebe7cf56ad95a2a4bd5d477d4e44a50bccb4a8a Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Fri, 17 Apr 2020 17:37:23 +0800 Subject: [PATCH 1/2] cherry pick #2319 to release-3.1 Signed-off-by: sre-bot --- reference/tiflash/upgrade.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index 80860bc3d4c35..ebbad8c0993f3 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -6,7 +6,15 @@ category: reference # Upgrade TiFlash Nodes +<<<<<<< HEAD To upgrade TiFlash nodes, take the following steps: +======= +> **Note:** +> +> To upgrade TiFlash from the Pre-RC version to a later version, contact [PingCAP](mailto:info@pingcap.com) for more information and help. + +Before the upgrade, make sure that the cluster is started. To upgrade TiFlash nodes, take the following steps: +>>>>>>> 3fc2a9e... tiflash: add warning to upgrade from pre-rc version (#2319) 1. Back up the `tidb-ansible` folder: From 6d0e381fef370c46a142a0384867f91180ab3d63 Mon Sep 17 00:00:00 2001 From: TomShawn <1135243111@qq.com> Date: Fri, 17 Apr 2020 21:08:26 +0800 Subject: [PATCH 2/2] resolve conflict --- reference/tiflash/upgrade.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index ebbad8c0993f3..e558cb2a28da5 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -6,15 +6,11 @@ category: reference # Upgrade TiFlash Nodes -<<<<<<< HEAD -To upgrade TiFlash nodes, take the following steps: -======= > **Note:** > > To upgrade TiFlash from the Pre-RC version to a later version, contact [PingCAP](mailto:info@pingcap.com) for more information and help. Before the upgrade, make sure that the cluster is started. To upgrade TiFlash nodes, take the following steps: ->>>>>>> 3fc2a9e... tiflash: add warning to upgrade from pre-rc version (#2319) 1. Back up the `tidb-ansible` folder: