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

Refine BR words #12022

Merged
merged 28 commits into from
Nov 28, 2022
Merged

Refine BR words #12022

merged 28 commits into from
Nov 28, 2022

Conversation

IANTHEREAL
Copy link
Contributor

First-time contributors' checklist

What is changed, added or deleted? (Required)

Added explanation of BR term
Refine some BR word usage

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 (in Chinese).

  • master (the latest development version)
  • v6.5 (TiDB 6.5 versions)
  • 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 16, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Oreoxmt
  • 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 requested a review from TomShawn November 16, 2022 10:46
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 16, 2022
@IANTHEREAL
Copy link
Contributor Author

@shichun-0415 PTAL

@TomShawn TomShawn requested review from shichun-0415 and Oreoxmt and removed request for TomShawn November 16, 2022 11:14
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). type/enhancement The issue or PR belongs to an enhancement. needs-cherry-pick-release-6.4 and removed missing-translation-status This PR does not have translation status info. labels Nov 16, 2022
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 22, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2022
shichun-0415
shichun-0415 reviewed Nov 28, 2022
View reviewed changes
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.

fix BR

shichun-0415
shichun-0415 reviewed Nov 28, 2022
View reviewed changes
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.

Fix br

shichun-0415
shichun-0415 reviewed Nov 28, 2022
View reviewed changes
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.

Have changed br command-line tool back to BR

shichun-0415
shichun-0415 approved these changes Nov 28, 2022
View reviewed changes
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 Nov 28, 2022
@IANTHEREAL
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@IANTHEREAL: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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 ti-community-infra/tichi repository.

Oreoxmt
Oreoxmt approved these changes Nov 28, 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.

Rest LGTM

br/br-pitr-guide.md Outdated Show resolved Hide resolved
glossary.md Outdated Show resolved Hide resolved
glossary.md Outdated Show resolved Hide resolved
glossary.md Outdated Show resolved Hide resolved
@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 28, 2022
shichun-0415 and others added 2 commits November 28, 2022 18:13
@shichun-0415 @Oreoxmt
Apply suggestions from code review
ec64f7d 
Co-authored-by: Aolin <aolinz@outlook.com>
@shichun-0415 @Oreoxmt
Apply suggestions from code review
ae3fb28 
Co-authored-by: Aolin <aolinz@outlook.com>
@shichun-0415
Copy link
Contributor

/merge

@shichun-0415 shichun-0415 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 Nov 28, 2022
@shichun-0415
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: ae3fb28

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 28, 2022
@ti-chi-bot ti-chi-bot merged commit c7d18fa into pingcap:master Nov 28, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 28, 2022
Merged
15 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Nov 28, 2022
@IANTHEREAL @ti-chi-bot
This is an automated cherry-pick of pingcap#12022
4756993 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Nov 28, 2022
@ti-chi-bot
Refine BR words (#12022) (#12139)
5b96e08
@IANTHEREAL IANTHEREAL deleted the ian/br-adjust branch December 28, 2022 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shichun-0415 shichun-0415 shichun-0415 approved these changes

@Oreoxmt Oreoxmt Oreoxmt approved these changes

Assignees
No one assigned
Labels
area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). size/L Denotes a PR that changes 100-499 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/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@IANTHEREAL @ti-chi-bot @shichun-0415 @Oreoxmt @TomShawn