Skip to content

Conversation

@TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Jun 10, 2020

What is changed, added or deleted? (Required)

This PR:

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)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-4.0, needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

What is the related PR or file link(s)?

@TomShawn TomShawn added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-4.0 special-week PR from Document Special Week. labels Jun 10, 2020
@TomShawn TomShawn requested review from crazycs520 and yikeke June 10, 2020 11:20
@yikeke yikeke added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Jun 11, 2020
@yikeke yikeke requested a review from lilin90 June 11, 2020 10:08
@yikeke
Copy link
Contributor

yikeke commented Jun 11, 2020

Please help review this PR~ @lilin90

@yikeke yikeke removed their request for review June 16, 2020 07:33
@yikeke yikeke added the status/PTAL This PR is ready for reviewing. label Jun 16, 2020
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

LGTM

@lilin90
Copy link
Member

lilin90 commented Jun 16, 2020

@TomShawn Please resolve the conflicts.

@TomShawn
Copy link
Contributor Author

TomShawn commented Jun 17, 2020

@lilin90 Conflicts resolved, PTAL again, thanks!

Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

LGTM

@lilin90
Copy link
Member

lilin90 commented Jun 17, 2020

/merge

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

Your auto merge job has been accepted, waiting for:

  • 2777

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

/run-all-tests

@TomShawn TomShawn merged commit baf97bd into pingcap:master Jun 17, 2020
@TomShawn TomShawn deleted the sql-diagnose-sw branch June 17, 2020 03:25
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jun 17, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #2921

ti-srebot added a commit that referenced this pull request Jun 17, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. special-week PR from Document Special Week. status/can-merge Indicates a PR has been approved by a committer. 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.

4 participants