From f2c531d58e687212dce05a9d4e3270099ec8e520 Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 25 Dec 2024 11:36:36 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #2665 Signed-off-by: ti-chi-bot --- .github/pull_request_template.md | 1 - README.md | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ab9d98b88..e0a92c4c9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -16,7 +16,6 @@ - [ ] v1.5 (TiDB Operator 1.5 versions) - [ ] v1.4 (TiDB Operator 1.4 versions) - [ ] v1.3 (TiDB Operator 1.3 versions) -- [ ] v1.2 (TiDB Operator 1.2 versions) ### What is the related PR or file link(s)? diff --git a/README.md b/README.md index 61970f6f8..fe28040e6 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,15 @@ Currently, we maintain the following versions for TiDB on Kubernetes documentati | Branch name | Version description | | :--- | :-- | | `master` | the latest development version | +<<<<<<< HEAD | `release-1.5` | the 1.5 version (latest stable) | +======= +| `release-1.6` | the 1.6 version (latest stable) | +| `release-1.5` | the 1.5 version | +>>>>>>> 6da2b818 (archive v1.2 (#2665)) | `release-1.4` | the 1.4 version | | `release-1.3` | the 1.3 version | -| `release-1.2` | the 1.2 version | +| `release-1.2` | the 1.2 version (archived) | | `release-1.1` | the 1.1 version (archived) | | `release-1.0` | the 1.0 version (archived) | @@ -34,4 +39,4 @@ Currently, we maintain the following versions for TiDB on Kubernetes documentati ## License -All documentation starting from TiDB Operator v1.5 is available under the terms of [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/). \ No newline at end of file +All documentation starting from TiDB Operator v1.5 is available under the terms of [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/). From 290fa6a29da2b3c4136e0a6cd2a508dc7494ee08 Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 25 Dec 2024 11:48:36 +0800 Subject: [PATCH 2/2] Apply suggestions from code review --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index fe28040e6..8492164d6 100644 --- a/README.md +++ b/README.md @@ -20,12 +20,7 @@ Currently, we maintain the following versions for TiDB on Kubernetes documentati | Branch name | Version description | | :--- | :-- | | `master` | the latest development version | -<<<<<<< HEAD -| `release-1.5` | the 1.5 version (latest stable) | -======= -| `release-1.6` | the 1.6 version (latest stable) | | `release-1.5` | the 1.5 version | ->>>>>>> 6da2b818 (archive v1.2 (#2665)) | `release-1.4` | the 1.4 version | | `release-1.3` | the 1.3 version | | `release-1.2` | the 1.2 version (archived) |