Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #3246 to release-3.0


What is changed, added or deleted? (Required)

add column-prune.md
Merge #3043 to fix CI failure

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 17, 2020
5 tasks
@ti-srebot ti-srebot added the type/cherry-pick-for-release-3.0 This PR is cherry-picked to release-3.0 from a source PR. label Jul 17, 2020
@ti-srebot ti-srebot requested a review from TomShawn July 17, 2020 06:48
@ti-srebot
Copy link
Contributor Author

@toutdesuite please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/docs/invitations

TOC.md Outdated
- [Identify Slow Queries](/identify-slow-queries.md)
- [Identify Expensive Queries](/identify-expensive-queries.md)
+ Scale
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@toutdesuite Please resolve the conflict. Be careful about the version difference.

Copy link
Contributor

Choose a reason for hiding this comment

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

@TomShawn PTAL, thanks

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 20, 2020
@toutdesuite toutdesuite added the status/can-merge Indicates a PR has been approved by a committer. label Jul 20, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 574e550 into pingcap:release-3.0 Jul 20, 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. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-3.0 This PR is cherry-picked to release-3.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants