Skip to content

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #7975

First-time contributors' checklist

What is changed, added or deleted? (Required)

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 Author

ti-chi-bot commented Apr 1, 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.

Details

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 area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-6.0 This PR is cherry-picked to release-6.0 from a source PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v6.0 This PR/issue applies to TiDB v6.0. labels Apr 1, 2022
@ti-chi-bot ti-chi-bot requested a review from shichun-0415 April 1, 2022 12:17
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 1, 2022
@shichun-0415
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

DetailsCommit hash: 0fe9564

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2022
@shichun-0415
Copy link
Contributor

/verify

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 2, 2022
@ti-chi-bot
Copy link
Member Author

Merge canceled because a new commit is pushed.

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

/rebase

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 2, 2022
@pingcap pingcap deleted a comment from CLAassistant Apr 2, 2022
@shichun-0415 shichun-0415 reopened this Apr 2, 2022
@CLAassistant
Copy link

CLAassistant commented Apr 2, 2022

CLA assistant check
All committers have signed the CLA.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-7975-to-release-6.0 branch from 7dd4f8e to a2bbf20 Compare April 2, 2022 05:52
@shichun-0415 shichun-0415 removed status/LGT1 Indicates that a PR has LGTM 1. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v6.0 This PR/issue applies to TiDB v6.0. type/cherry-pick-for-release-6.0 This PR is cherry-picked to release-6.0 from a source PR. labels Apr 2, 2022
@ti-chi-bot ti-chi-bot added status/LGT1 Indicates that a PR has LGTM 1. missing-translation-status This PR does not have translation status info. labels Apr 2, 2022
@shichun-0415 shichun-0415 removed their assignment Apr 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

missing-translation-status This PR does not have translation status info. status/LGT1 Indicates that a PR has LGTM 1.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants