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

Jump to bottom

collation: remove a redundant sentence #11131

Merged
merged 3 commits into from
Nov 4, 2022
Merged

collation: remove a redundant sentence #11131

merged 3 commits into from
Nov 4, 2022

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Nov 3, 2022 •
edited
Loading

What is changed, added or deleted? (Required)

collation: remove a redundant sentence

Close #7078 #6539

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.4 (TiDB 6.4 versions)
  • v6.3 (TiDB 6.3 versions)
  • v6.1 (TiDB 6.1 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)

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

  • This PR is translated from:
  • Other reference 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 Nov 3, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Oreoxmt

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 3, 2022
@TomShawn TomShawn requested review from wjhuang2016 and Oreoxmt and removed request for shichun-0415 November 3, 2022 07:00
@TomShawn
Copy link
Contributor Author

TomShawn commented Nov 3, 2022

/cc @morgo

@ti-chi-bot
Copy link
Member

@TomShawn: GitHub didn't allow me to request PR reviews from the following users: morgo.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @morgo

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@TomShawn TomShawn self-assigned this Nov 3, 2022
@TomShawn TomShawn added type/bugfix This PR fixes a bug. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. ONCALL Relates to documentation oncall. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.3 and removed missing-translation-status This PR does not have translation status info. labels Nov 3, 2022
Oreoxmt
Oreoxmt approved these changes Nov 3, 2022
View reviewed changes
Copy link
Collaborator

@Oreoxmt Oreoxmt 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 Nov 3, 2022
@morgo
Copy link
Contributor

morgo commented Nov 4, 2022

LGTM

@TomShawn @Oreoxmt
Update faq/high-reliability-faq.md
345f2c9 
Co-authored-by: Aolin <aolin.zhang@pingcap.com>
@TomShawn
Copy link
Contributor Author

TomShawn commented Nov 4, 2022

/remove-status LGT1
/status LGT2

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 4, 2022
@TomShawn
Copy link
Contributor Author

TomShawn commented Nov 4, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 345f2c9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 4, 2022
@TomShawn TomShawn merged commit d52a74d into master Nov 4, 2022
@TomShawn TomShawn deleted the TomShawn-patch-2 branch November 4, 2022 09:02
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 4, 2022
Merged
13 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Nov 4, 2022
Merged
13 tasks
@ti-chi-bot
Copy link
Member

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

@TomShawn TomShawn added translation/doing This PR's assignee is translating this PR. and removed translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. labels Nov 4, 2022
ti-chi-bot added a commit that referenced this pull request Nov 4, 2022
@ti-chi-bot
collation: remove a redundant sentence (#11131) (#11161)
2f72469
ti-chi-bot added a commit that referenced this pull request Nov 4, 2022
@ti-chi-bot
collation: remove a redundant sentence (#11131) (#11163)
63154af
@TomShawn TomShawn mentioned this pull request Nov 10, 2022
Closed
@TomShawn TomShawn added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR's assignee is translating this PR. labels Jan 4, 2023
@TomShawn TomShawn mentioned this pull request Jan 4, 2023
Merged
14 tasks
This was referenced Jan 6, 2023
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

@Oreoxmt Oreoxmt Oreoxmt approved these changes

Assignees

@TomShawn TomShawn

Labels
needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. ONCALL Relates to documentation oncall. 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/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

new_collations_enabled_on_first_bootstrap reference to TiDB 4.0 is incorrect advice
5 participants
@TomShawn @ti-chi-bot @morgo @wjhuang2016 @Oreoxmt