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

Fix a typo in Update character-set-and-collation.md (#6124) #6126

Merged
merged 2 commits into from
Apr 25, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 23, 2021

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

# In docs-cn repo:
git pr https://github.com/pingcap/docs-cn/pull/6126

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

git push [email protected]:ti-srebot/docs-cn.git pr/6126:release-3.0-41d6eac66286

First-time contributors' checklist

What is changed, added or deleted? (Required)

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)?

Fix a typo in Update character-set-and-collation.md

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-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-3.0 This PR is cherry-picked to release-3.0 from a source PR. labels Apr 23, 2021
@ti-chi-bot ti-chi-bot added the missing-translation-status This PR does not have translation status info. label Apr 23, 2021
@ti-chi-bot ti-chi-bot requested a review from TomShawn April 23, 2021 11:23
@ti-srebot ti-srebot requested a review from TomShawn April 23, 2021 11:23
@ti-srebot
Copy link
Contributor Author

@Joyinqin you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Apr 23, 2021
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 23, 2021
@TomShawn
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

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 Apr 25, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 365e747

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 25, 2021
@ti-chi-bot ti-chi-bot merged commit 2bcdad2 into pingcap:release-3.0 Apr 25, 2021
@TomShawn TomShawn deleted the release-3.0-41d6eac66286 branch April 25, 2021 05:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 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-3.0 This PR is cherry-picked to release-3.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants