Skip to content

Conversation

@ran-huang
Copy link
Contributor

Signed-off-by: Ran huangran@pingcap.com

What is changed, added or deleted? (Required)

This is a manual cherry-pick from #2782

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang ran-huang added needs-cherry-pick-2.1 translation/no-need No need to translate this PR. labels Jul 30, 2020
@ran-huang ran-huang requested a review from lilin90 July 30, 2020 11:21
@@ -1,129 +0,0 @@
---
Copy link
Member

Choose a reason for hiding this comment

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

Is it deleted because this file is duplicated by the table-filter.md file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. This file should have been deleted in this PR (#3139), but the cherry-pick bot just missed it.

Copy link
Member

Choose a reason for hiding this comment

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

Got it.

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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 31, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 31, 2020

/merge

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

/run-all-tests

@ti-srebot ti-srebot merged commit e8146c8 into pingcap:release-3.1 Jul 31, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 31, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-2.1 in PR #3496

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 31, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #3497

@ran-huang ran-huang deleted the update_blm_words_3.1 branch July 31, 2020 09:12
ti-srebot added a commit that referenced this pull request Jul 31, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: Ran <huangran@pingcap.com>
ti-srebot added a commit that referenced this pull request Jul 31, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: Ran <huangran@pingcap.com>
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. status/LGT1 Indicates that a PR has LGTM 1. translation/no-need No need to translate this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants