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

Align 6 PRs from docs-cn #7887

Merged
merged 3 commits into from Apr 13, 2022
Merged

Align 6 PRs from docs-cn #7887

merged 3 commits into from Apr 13, 2022

Conversation

TomShawn
Copy link
Contributor

What is changed, added or deleted? (Required)

Align 6 PRs from docs-cn, mostly bug fixes.

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • 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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 21, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • shichun-0415

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 21, 2022
@TomShawn TomShawn added type/bug-fix Fixes typos, wrong format, or other wrong or inaccurate document content. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. require-LGT1 Indicates that the PR requires an LGTM. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 21, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 1, 2022
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 2, 2022
@shichun-0415
Copy link
Contributor

shichun-0415 commented Apr 8, 2022

Seems this PR is not translated: https://github.com/pingcap/docs-cn/pull/8339/files. PTAL. The rest looks good to me.

@TomShawn
Copy link
Contributor Author

TomShawn commented Apr 12, 2022

Seems this PR is not translated: https://github.com/pingcap/docs-cn/pull/8339/files. PTAL. The rest looks good to me.

Because it's already there in docs.

@shichun-0415
Copy link
Contributor

Seems this PR is not translated: https://github.com/pingcap/docs-cn/pull/8339/files. PTAL. The rest looks good to me.

Because it's already there in docs.

Get. Maybe it's better to label the source PR as "translation no need"?

Copy link
Contributor

@shichun-0415 shichun-0415 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 12, 2022
@TomShawn
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2d12a4d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2022
@ti-chi-bot ti-chi-bot merged commit 32088b8 into pingcap:master Apr 13, 2022
@TomShawn TomShawn deleted the pr-a;ign-hah branch April 13, 2022 05:56
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 13, 2022
15 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8196.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 13, 2022
15 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8197.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Apr 13, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 13, 2022
15 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8198.

ti-chi-bot added a commit that referenced this pull request Apr 13, 2022
ti-chi-bot added a commit that referenced this pull request Apr 13, 2022
ti-chi-bot added a commit that referenced this pull request Apr 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. require-LGT1 Indicates that the PR requires an LGTM. 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. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/bug-fix Fixes typos, wrong format, or other wrong or inaccurate document content.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants