Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #3454 to release-2.1


What is changed, added or deleted? (Required)

Align pingcap/docs-cn#3541 that applies to other 4 release branches.

After this PR is merged, this file will be updated soon in #3453 on master and v4.0 branch. FYI @ran-huang @lichunzhu

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR. labels Jul 28, 2020
@ti-srebot ti-srebot requested review from lichunzhu and ran-huang July 28, 2020 11:27
@ran-huang
Copy link
Contributor

@yikeke Please resolve conflicts.

@yikeke
Copy link
Contributor

yikeke commented Jul 29, 2020

Aligned with pingcap/docs-cn#3562

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 29, 2020
@yikeke yikeke merged commit e608aa2 into pingcap:release-2.1 Jul 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants