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.

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

*: Fix MsgWantRollbackMerge not covered compile error after update kvproto #7760

Closed
wants to merge 1 commit into from
Closed

Conversation

yiwu-arbug
Copy link

Signed-off-by: Yi Wu yiwu@pingcap.com

What problem does this PR solve?

Problem Summary: #7112 doesn't cherry-pick a change from #6715, which is only need after updating kvproto. Pick it back and update kvproto.

What is changed and how it works?

Proposal: xxx

What's Changed: Pick missing change from #6715 and update kvproto.

Related changes

N/A.

Check List

CI

Release note

  • No release note

@BusyJay
Copy link
Member

BusyJay commented May 8, 2020

#6584 needs to be cherry-pick to 3.1 too. /cc @gengliqi

@yiwu-arbug
Copy link
Author

#6584

I'll abandon this one in that case.

@yiwu-arbug
Copy link
Author

cherry-pick bot sent #7762 but there's some merge conflict. @gengliqi do you mind fixing it? Thanks.

@yiwu-arbug yiwu-arbug closed this May 8, 2020
@gengliqi
Copy link
Member

gengliqi commented May 8, 2020

cherry-pick bot sent #7762 but there's some merge conflict. @gengliqi do you mind fixing it? Thanks.

Sorry. I will fix it ASAP

@yiwu-arbug yiwu-arbug deleted the merge_3.1 branch May 9, 2020 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants