Skip to content

Conversation

@sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 16, 2020

cherry-pick #2304 to release-2.1


What is changed, added or deleted? (Required)

Rename the title, make it the same as others.

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

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot added the type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR. label Apr 16, 2020
@sre-bot sre-bot requested a review from jackysp April 16, 2020 15:25
@TomShawn
Copy link
Contributor

@ran-huang PTAL, thanks

@ran-huang
Copy link
Contributor

@TomShawn L47 contains a TiDB Controller. Please change it to TiDB Control.
It seems I cannot make a comment on that Line.

@TomShawn
Copy link
Contributor

@TomShawn L47 contains a TiDB Controller. Please change it to TiDB Control.
It seems I cannot make a comment on that Line.

Thanks. Updated.

@ran-huang
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented May 12, 2020

/run-all-tests

@sre-bot sre-bot merged commit 665d64b into pingcap:release-2.1 May 12, 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. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants