Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: Revert "#19008" and "#18788" #21599

Merged
merged 7 commits into from
Dec 14, 2020
Merged

*: Revert "#19008" and "#18788" #21599

merged 7 commits into from
Dec 14, 2020

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Dec 9, 2020

This reverts commit 76c86a8.
And reverts commit cd16de8.

Release note

  • No release note.

@XuHuaiyu XuHuaiyu requested review from a team as code owners December 9, 2020 07:29
@XuHuaiyu XuHuaiyu requested review from SunRunAway and removed request for a team December 9, 2020 07:29
@sre-bot
Copy link
Contributor

sre-bot commented Dec 9, 2020

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what's changed

Or if the count of mainly changed packages are more than 3, use

  • *: what's changed

@XuHuaiyu XuHuaiyu removed request for a team and SunRunAway December 9, 2020 07:29
@XuHuaiyu XuHuaiyu changed the title Revert "#19008" and "#18788" *: Revert "#19008" and "#18788" Dec 9, 2020
@XuHuaiyu XuHuaiyu force-pushed the revert_commit_76c86a8 branch from 22e06f3 to 140a27d Compare December 14, 2020 03:32
winoros
winoros reviewed Dec 14, 2020
View reviewed changes
Copy link
Member

@winoros winoros 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 Dec 14, 2020
eurekaka
eurekaka approved these changes Dec 14, 2020
View reviewed changes
Copy link
Contributor

@eurekaka eurekaka 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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Dec 14, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Dec 14, 2020
@XuHuaiyu
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 21216

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

/run-all-tests

@ti-srebot
Copy link
Contributor

@XuHuaiyu merge failed.

@XuHuaiyu
Copy link
Contributor Author

/run-unit-test

@XuHuaiyu XuHuaiyu merged commit 5acff8d into pingcap:master Dec 14, 2020
@XuHuaiyu XuHuaiyu deleted the revert_commit_76c86a8 branch December 14, 2020 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@winoros winoros winoros left review comments

@eurekaka eurekaka eurekaka approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

Assignees
No one assigned
Labels
component/config component/executor component/statistics sig/execution SIG execution sig/planner SIG: Planner status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@XuHuaiyu @sre-bot @ti-srebot @eurekaka @winoros