Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zh, en: update EOS for 1.2 (#2652) #2661

Merged
merged 3 commits into from
Dec 23, 2024
Merged

zh, en: update EOS for 1.2 (#2652) #2661

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa5b471
This is an automated cherry-pick of #2652
csuzhangxc Dec 23, 2024
6076256
Apply suggestions from code review
Oreoxmt Dec 23, 2024
fb67835
Apply suggestions from code review
Oreoxmt Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions en/tidb-operator-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@ The corresponding relationship between TiDB Operator and TiDB versions is as fol
| TiDB versions | Compatible TiDB Operator versions |
|:---|:---|
| dev | dev |
<<<<<<< HEAD
| TiDB >= 5.4 | 1.3 |
| 5.1 <= TiDB < 5.4 | 1.3 (Recommended), 1.2 |
| 3.0 <= TiDB < 5.1 | 1.3 (Recommended), 1.2, 1.1 |
=======
| TiDB >= 8.0 | 1.6 (Recommended), 1.5 |
| 7.1 <= TiDB < 8.0 | 1.5 (Recommended), 1.4 |
| 6.5 <= TiDB < 7.1 | 1.5, 1.4 (Recommended), 1.3 |
| 5.4 <= TiDB < 6.5 | 1.4, 1.3 (Recommended) |
| 5.1 <= TiDB < 5.4 | 1.4, 1.3 (Recommended), 1.2 (End of support) |
| 3.0 <= TiDB < 5.1 | 1.4, 1.3 (Recommended), 1.2 (End of support), 1.1 (End of support) |
>>>>>>> b54c2b04 (zh, en: update EOS for 1.2 (#2652))
| 2.1 <= TiDB < v3.0| 1.0 (End of support) |
Oreoxmt marked this conversation as resolved.
Show resolved Hide resolved

## Manage TiDB clusters using TiDB Operator
Expand Down
9 changes: 9 additions & 0 deletions zh/tidb-operator-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@ TiDB Operator 与适用的 TiDB 版本的对应关系如下：
| TiDB 版本 | 适用的 TiDB Operator 版本 |
|:---|:---|
| dev | dev |
<<<<<<< HEAD
| TiDB >= 5.4 | 1.3 |
| 5.1 <= TiDB < 5.4 | 1.3（推荐），1.2 |
| 3.0 <= TiDB < 5.1 | 1.3（推荐），1.2，1.1 |
=======
| TiDB >= 8.0 | 1.6（推荐），1.5 |
| 7.1 <= TiDB < 8.0 | 1.5（推荐），1.4 |
| 6.5 <= TiDB < 7.1 | 1.5, 1.4（推荐），1.3 |
| 5.4 <= TiDB < 6.5 | 1.4, 1.3（推荐） |
| 5.1 <= TiDB < 5.4 | 1.4，1.3（推荐），1.2（停止维护） |
| 3.0 <= TiDB < 5.1 | 1.4，1.3（推荐），1.2（停止维护），1.1（停止维护） |
>>>>>>> b54c2b04 (zh, en: update EOS for 1.2 (#2652))
| 2.1 <= TiDB < v3.0| 1.0（停止维护） |
Oreoxmt marked this conversation as resolved.
Show resolved Hide resolved

## 使用 TiDB Operator 管理 TiDB 集群
Expand Down
Loading