Skip to content

Update troubleshoot-lock-conflicts.md (#4033)#4067

Merged
yikeke merged 2 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-a2a61c13ed66
Jul 28, 2020
Merged

Update troubleshoot-lock-conflicts.md (#4033)#4067
yikeke merged 2 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-a2a61c13ed66

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

cherry-pick #4033 to release-4.0


What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • 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)?

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added the type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. label Jul 28, 2020
@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 28, 2020
@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jul 28, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 28, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor Author

/run-all-tests

Copy link
Copy Markdown
Contributor

@ireneontheway ireneontheway 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-srebot
Copy link
Copy Markdown
Contributor Author

@ireneontheway,Thanks for your review. However, LGTM is restricted to Reviewers or higher roles.See the corresponding SIG page for more information. Related SIGs: docs(slack).

@ti-srebot
Copy link
Copy Markdown
Contributor Author

/run-all-tests

@yikeke yikeke merged commit 9ed1cbf into pingcap:release-4.0 Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants