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 4 PRs #7521

Merged
merged 2 commits into from
Feb 9, 2022
Merged

Align 4 PRs #7521

merged 2 commits into from
Feb 9, 2022

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Feb 8, 2022

What is changed, added or deleted? (Required)

Align 4 PRs

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)
  • 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 Feb 8, 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 Feb 8, 2022
@TomShawn TomShawn requested a review from shichun-0415 February 8, 2022 10:08
@TomShawn TomShawn added needs-cherry-pick-release-5.3 type/bugfix This PR fixes a bug. type/enhancement The issue or PR belongs to an enhancement. area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. require-LGT1 Indicates that the PR requires an LGTM. and removed missing-translation-status This PR does not have translation status info. labels Feb 8, 2022
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 Feb 8, 2022
@TomShawn
Copy link
Contributor Author

TomShawn commented Feb 9, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0692dfc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 9, 2022
@ti-chi-bot ti-chi-bot merged commit 3bf91a5 into pingcap:master Feb 9, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 9, 2022
14 tasks
@ti-chi-bot
Copy link
Member

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

@TomShawn TomShawn deleted the align-prs-fews branch February 9, 2022 02:26
ti-chi-bot added a commit that referenced this pull request Feb 10, 2022
@TomShawn TomShawn added the translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. label Apr 14, 2022
@qiancai qiancai added needs-cherry-pick-release-5.1 requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jun 14, 2024
ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Jun 14, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.1: #17898.

@ti-chi-bot ti-chi-bot mentioned this pull request Jun 14, 2024
14 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.2: #17899.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Jun 14, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 14, 2024
14 tasks
@qiancai
Copy link
Collaborator

qiancai commented Jun 14, 2024

Adds the needs-cherry-pick-release-5.1 and needs-cherry-pick-release-5.2 labels because pingcap/docs-cn#7393 needs to be cherry-picked to v5.1 and v5.2. Because the current PR also contains translation changes of other source PRs, additional changes are required in v5.1 and v5.2 cherry-pick PRs.

ti-chi-bot bot pushed a commit that referenced this pull request Jun 14, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Jun 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. require-LGT1 Indicates that the PR requires an LGTM. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. 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. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/bugfix This PR fixes a bug. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants