Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #3048 to release-2.1


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 mentioned this pull request Jul 13, 2020
5 tasks
@ti-srebot ti-srebot added special-week PR from Document Special Week. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR. labels Jul 13, 2020
Copy link
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

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

@imtbkcat Since you have ticked v2.1 in #3048, there are a lot of conflicts in this PR. Please resolve the conflicts.

Copy link
Contributor

@TomShawn TomShawn 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 14, 2020
@TomShawn TomShawn merged commit 94eb52c into pingcap:release-2.1 Jul 14, 2020
@lilin90 lilin90 deleted the release-2.1-64044c789bdf branch July 14, 2020 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

special-week PR from Document Special Week. status/LGT1 Indicates that a PR has LGTM 1. 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