Skip to content

Update troubleshoot-lock-conflicts.md #4033

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jul 28, 2020
Merged

Update troubleshoot-lock-conflicts.md #4033

merged 3 commits into from
Jul 28, 2020

Conversation

@yikeke
Copy link
Contributor

@yikeke yikeke commented Jul 23, 2020 •
edited
Loading

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)?

@yikeke yikeke marked this pull request as ready for review July 27, 2020 07:31
@yikeke yikeke requested a review from superlzs0476 July 27, 2020 07:32
@yikeke yikeke added needs-cherry-pick-4.0 translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. labels Jul 27, 2020
@yikeke yikeke requested a review from ireneontheway July 28, 2020 03:53
@yikeke yikeke added the require-LGT1 Indicates that the PR requires an LGTM. label Jul 28, 2020
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 28, 2020

@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).

@yikeke
Copy link
Contributor Author

yikeke commented Jul 28, 2020

/merge

@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 28, 2020

@yikeke Oops! This PR requires at least 1 LGTMs to merge. The current number of LGTM is 0.

ireneontheway
ireneontheway approved these changes Jul 28, 2020
View reviewed changes
Copy link
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
Contributor

ti-srebot commented Jul 28, 2020

@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).

@yikeke yikeke merged commit a2a61c1 into master Jul 28, 2020
@yikeke yikeke deleted the fix-lock-conflicts-doc branch July 28, 2020 04:12
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 28, 2020
@yikeke @ti-srebot
cherry pick pingcap#4033 to release-4.0
e044b52 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 28, 2020
Merged
5 tasks
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 28, 2020

cherry pick to release-4.0 in PR #4067

yikeke added a commit that referenced this pull request Jul 28, 2020
@ti-srebot @yikeke
cherry pick #4033 to release-4.0 (#4067)
9ed1cbf 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@superlzs0476 superlzs0476 Awaiting requested review from superlzs0476

1 more reviewer

@ireneontheway ireneontheway ireneontheway approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

require-LGT1 Indicates that the PR requires an LGTM. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yikeke @ti-srebot @ireneontheway