Skip to content

add troubleshoot-lock-conflicts#2932

Merged
ti-srebot merged 28 commits into
pingcap:masterfrom
superlzs0476:troubleshoot-lock-conflicts
Jul 30, 2020
Merged

add troubleshoot-lock-conflicts#2932
ti-srebot merged 28 commits into
pingcap:masterfrom
superlzs0476:troubleshoot-lock-conflicts

Conversation

@superlzs0476
Copy link
Copy Markdown
Contributor

@superlzs0476 superlzs0476 commented Jun 17, 2020

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

@TomShawn TomShawn added the translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. label Jun 17, 2020
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
@yikeke yikeke requested review from yikeke and removed request for toutdesuite June 22, 2020 02:59
Comment thread troubleshoot-lock-conflicts.md Outdated
@yikeke yikeke added the status/require-change Needs the author to address comments. label Jul 3, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476, please update your pull request.

superlzs0476 and others added 3 commits July 6, 2020 14:20
Co-authored-by: zhenjiao gao <26379799+zhenjiaogao@users.noreply.github.com>
Co-authored-by: Lynn <zimu_xia@126.com>
Co-authored-by: zhenjiao gao <26379799+zhenjiaogao@users.noreply.github.com>
Comment thread troubleshoot-lock-conflicts.md
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476, please update your pull request.

2 similar comments
@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476, please update your pull request.

@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476, please update your pull request.

@ti-srebot
Copy link
Copy Markdown
Contributor

No updates for a long time, close PR.

@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476, please update your pull request.

@superlzs0476
Copy link
Copy Markdown
Contributor Author

LGTM

@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476 Oops. LGTM is restricted to reviewers.

Copy link
Copy Markdown
Contributor

@yikeke yikeke 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 ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 28, 2020
Comment thread troubleshoot-lock-conflicts.md Outdated
Comment thread troubleshoot-lock-conflicts.md Outdated
@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jul 28, 2020

PTAL again @zhenjiaogao @zimulala

@yikeke yikeke added status/PTAL This PR is ready for reviewing. and removed status/require-change Needs the author to address comments. labels Jul 28, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor

@superlzs0476, please update your pull request.

@ti-srebot
Copy link
Copy Markdown
Contributor

@zhenjiaogao, @zimulala, @yikeke, PTAL.

@zhenjiaogao
Copy link
Copy Markdown
Contributor

LGTM

@ti-srebot
Copy link
Copy Markdown
Contributor

@zhenjiaogao,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 added the require-LGT1 Indicates that the PR requires an LGTM. label Jul 30, 2020
@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jul 30, 2020

/merge

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

/run-all-tests

@ti-srebot ti-srebot merged commit 44cbe65 into pingcap:master Jul 30, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 30, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Copy Markdown
Contributor

cherry pick to release-4.0 in PR #3486

yikeke pushed a commit that referenced this pull request Jul 30, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

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

Labels

require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. 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.

7 participants