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.

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

Synchronize two changes in docs-cn/pull/5856 (#5148) #5149

Merged
merged 1 commit into from
Mar 29, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 29, 2021

cherry-pick #5148 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In docs repo:
git pr https://github.com/pingcap/docs/pull/5149

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/docs.git pr/5149:release-5.0-d1ab711622a7

First-time contributors' checklist

What is changed, added or deleted? (Required)

Synchronize two changes made in pingcap/docs-cn#5856 to English

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

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • 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
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. v5.0 This PR/issue applies to TiDB v5.0. labels Mar 29, 2021
@ti-srebot ti-srebot requested a review from ran-huang March 29, 2021 10:27
@ran-huang
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • ran-huang

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 29, 2021
@ran-huang
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 0e43a87

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2021
@ti-chi-bot ti-chi-bot merged commit 34e4006 into pingcap:release-5.0 Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. v5.0 This PR/issue applies to TiDB v5.0.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants