From 0f6074f37d9bcf2ed551c70c8cad307677e41972 Mon Sep 17 00:00:00 2001 From: Ran Date: Mon, 14 Aug 2023 14:55:04 +0800 Subject: [PATCH] Update upgrade-tidb-using-tiup.md --- upgrade-tidb-using-tiup.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/upgrade-tidb-using-tiup.md b/upgrade-tidb-using-tiup.md index a29c5a120b53c..c3d860b391227 100644 --- a/upgrade-tidb-using-tiup.md +++ b/upgrade-tidb-using-tiup.md @@ -26,12 +26,8 @@ This document is targeted for the following upgrade paths: > **Note:** > -<<<<<<< HEAD -> If your cluster to be upgraded is v3.1 or an earlier version (v3.0 or v2.1), the direct upgrade to v7.0.0 is not supported. You need to upgrade your cluster first to v4.0 and then to v7.0.0. -======= -> - If your cluster to be upgraded is v3.1 or an earlier version (v3.0 or v2.1), the direct upgrade to v7.2.0 is not supported. You need to upgrade your cluster first to v4.0 and then to v7.2.0. +> - If your cluster to be upgraded is v3.1 or an earlier version (v3.0 or v2.1), the direct upgrade to v7.0.0 is not supported. You need to upgrade your cluster first to v4.0 and then to v7.0.0. > - TiDB nodes use the value of the [`server-version`](/tidb-configuration-file.md#server-version) configuration item to verify the current TiDB version. Therefore, to avoid unexpected behaviors, before upgrading the TiDB cluster, you need to set the value of `server-version` to empty or the real version of the current TiDB cluster. ->>>>>>> a1528c0f02 (Remove server version upgrade (#14457)) ## Upgrade caveat