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

remove unnecessary white space (#2678) #2685

Open
wants to merge 1 commit into
base: release-1.3
Choose a base branch
from
+5 −1
Open

remove unnecessary white space (#2678) #2685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions en/releases/release-1.3.0-beta.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ TiDB Operator version: 1.3.0-beta.1
## Rolling Update Changes

- Due to changes in [#4358](https://github.com/pingcap/tidb-operator/pull/4358), if the TiDB cluster (>= v5.4) is deployed by TiDB Operator v1.2, upgrading TiDB Operator to v1.3.0-beta.1 causes TiFlash to rolling upgrade. It is recommended to upgrade TiDB Operator to v1.3 before upgrading the TiDB cluster to v5.4.0 or later versions.
<<<<<<< HEAD
- Due to changes in [#4169](https://github.com/pingcap/tidb-operator/pull/4169) , for TiDB clusters >= v5.0, if `spec.tikv.seperateRocksDBLog: true` or `spec.tikv.separateRaftLog: true` is configured, upgrading TiDB Operator to v1.3.0-beta.1 causes TiKV to rolling upgrade.
=======
- Due to changes in [#4169](https://github.com/pingcap/tidb-operator/pull/4169) , for TiDB clusters >= v5.0, if `spec.tikv.separateRocksDBLog: true` or `spec.tikv.separateRaftLog: true` is configured, upgrading TiDB Operator to v1.3.0-beta.1 causes TiKV to rolling upgrade.
>>>>>>> 435b6803 (remove unnecessary white space (#2678))
- Due to changes in [#4198](https://github.com/pingcap/tidb-operator/pull/4198), upgrading TiDB Operator causes the recreation of TidbMonitor Pod.

## New Features
Expand Down
2 changes: 1 addition & 1 deletion zh/releases/release-1.1-ga.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ TiDB Operator 版本：1.1.0

## 其他重要更新

* 修复了同时启用 `PodWebhook` 和 增强型 StatefulSet 时 `TidbCluster` 升级的错误 ([#2507](https://github.com/pingcap/tidb-operator/pull/2507), [@Yisaer](https://github.com/Yisaer))
* 修复了同时启用 `PodWebhook` 和增强型 StatefulSet 时 `TidbCluster` 升级的错误 ([#2507](https://github.com/pingcap/tidb-operator/pull/2507), [@Yisaer](https://github.com/Yisaer))
* `tidb-scheduler` 中支持 preemption ([#2510](https://github.com/pingcap/tidb-operator/pull/2510), [@cofyc](https://github.com/cofyc))
* 将 BR 更新为 v4.0.0-rc.2，包含 `auto_random` 的修复 ([#2508](https://github.com/pingcap/tidb-operator/pull/2508), [@DanielZhangQD](https://github.com/DanielZhangQD))
* 增强型 StatefulSet 支持 TiFlash ([#2469](https://github.com/pingcap/tidb-operator/pull/2469), [@DanielZhangQD](https://github.com/DanielZhangQD))
Expand Down
Loading