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

archive v1.2 (#2665) #2671

Merged
merged 2 commits into from
Dec 25, 2024
Merged

archive v1.2 (#2665) #2671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2c531d
This is an automated cherry-pick of #2665
Oreoxmt Dec 25, 2024
290fa6a
Apply suggestions from code review
Oreoxmt Dec 25, 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
1 change: 0 additions & 1 deletion .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?

Expand Down
9 changes: 7 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Oreoxmt marked this conversation as resolved.
Show resolved Hide resolved
| `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) |

Expand All @@ -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/).
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/).
Loading