Skip to content

Revert #8186 in release-5.4#9005

Merged
ti-chi-bot merged 1 commit into
pingcap:release-5.4from
TomShawn:revert-8186-5.4
Apr 15, 2022
Merged

Revert #8186 in release-5.4#9005
ti-chi-bot merged 1 commit into
pingcap:release-5.4from
TomShawn:revert-8186-5.4

Conversation

@TomShawn
Copy link
Copy Markdown
Contributor

What is changed, added or deleted? (Required)

Revert #8186 in release-5.4

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.1 (TiDB 6.1 versions)
  • 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)?

  • 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
Copy Markdown
Member

ti-chi-bot commented Apr 15, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • ran-huang

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.

@TomShawn TomShawn requested review from djshow832 and ran-huang April 15, 2022 06:05
@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 Apr 15, 2022
@TomShawn TomShawn assigned TomShawn and unassigned TomShawn Apr 15, 2022
@TomShawn TomShawn added translation/no-need No need to translate this PR. type/bugfix This PR fixes a bug. sig/diagnosis type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. and removed missing-translation-status This PR does not have translation status info. labels Apr 15, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 15, 2022
@ran-huang
Copy link
Copy Markdown
Contributor

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

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

DetailsCommit hash: 14997e4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@ti-chi-bot ti-chi-bot merged commit 3b5a37f into pingcap:release-5.4 Apr 15, 2022
@TomShawn TomShawn deleted the revert-8186-5.4 branch April 15, 2022 06:13
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. translation/no-need No need to translate this PR. type/bugfix This PR fixes a bug. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants