Skip to content

tidb-lightning: delete record option in conflict detection #14538

Merged
ti-chi-bot[bot] merged 1 commit intopingcap:release-7.2from
hfxsd:remove-record
Aug 18, 2023
Merged

tidb-lightning: delete record option in conflict detection #14538
ti-chi-bot[bot] merged 1 commit intopingcap:release-7.2from
hfxsd:remove-record

Conversation

@hfxsd
Copy link
Copy Markdown
Collaborator

@hfxsd hfxsd commented Aug 18, 2023

What is changed, added or deleted? (Required)

Delete record in conflict detection.

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)
  • v7.4 (TiDB 7.4 versions)
  • v7.3 (TiDB 7.3 versions)
  • v7.2 (TiDB 7.2 versions)
  • v7.1 (TiDB 7.1 versions)
  • v7.0 (TiDB 7.0 versions)
  • v6.5 (TiDB 6.5 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)?

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

@hfxsd hfxsd added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.0 needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Aug 18, 2023
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 18, 2023
@hfxsd hfxsd self-assigned this Aug 18, 2023
@hfxsd hfxsd requested review from Frank945946 and lance6716 August 18, 2023 07:06
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 18, 2023
@hfxsd hfxsd requested a review from Oreoxmt August 18, 2023 07:11
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 18, 2023
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot bot commented Aug 18, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-18 07:09:04.381419286 +0000 UTC m=+874108.930435273: ☑️ agreed by lance6716.
  • 2023-08-18 07:13:48.203786988 +0000 UTC m=+874392.752802975: ☑️ agreed by Oreoxmt.

@hfxsd
Copy link
Copy Markdown
Collaborator Author

hfxsd commented Aug 18, 2023

/approve

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot bot commented Aug 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hfxsd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Aug 18, 2023
@ti-chi-bot ti-chi-bot bot merged commit 9818015 into pingcap:release-7.2 Aug 18, 2023
@ti-chi-bot
Copy link
Copy Markdown
Member

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

@ti-chi-bot
Copy link
Copy Markdown
Member

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

@ti-chi-bot
Copy link
Copy Markdown
Member

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

@ti-chi-bot
Copy link
Copy Markdown
Member

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

Copy link
Copy Markdown
Collaborator

@Frank945946 Frank945946 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. lgtm needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants