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

cherry pick #1105 & #1107 to release 7.1 #1113

Merged
merged 2 commits into from
May 10, 2023
Merged

Conversation

zyguan
Copy link

@zyguan zyguan commented May 10, 2023

to fix the conflict of tikv/tikv#14659

MyonKeminta and others added 2 commits April 24, 2023 13:13
… lock on the key (if any) is a real primary lock (#1105)

* Change implementation

* Fix typo in comment

Signed-off-by: MyonKeminta <[email protected]>

* Update proto/kvrpcpb.proto

Co-authored-by: ekexium <[email protected]>

---------

Signed-off-by: MyonKeminta <[email protected]>
Co-authored-by: MyonKeminta <[email protected]>
Co-authored-by: ekexium <[email protected]>
Signed-off-by: MyonKeminta <[email protected]>
Co-authored-by: MyonKeminta <[email protected]>
@zyguan zyguan merged commit 0af0bec into release-7.1 May 10, 2023
@wuhuizuo wuhuizuo deleted the cherry-pick-1105-1107 branch February 29, 2024 08:53
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.

3 participants