Skip to content

Batch cherry pick from release-3.1#356

Merged
ti-srebot merged 18 commits intotikv:masterfrom
marsishandsome:feature/batch-cherry-pick
Dec 1, 2021
Merged

Batch cherry pick from release-3.1#356
ti-srebot merged 18 commits intotikv:masterfrom
marsishandsome:feature/batch-cherry-pick

Conversation

marsishandsome and others added 14 commits December 1, 2021 11:45
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: birdstorm <samuelwyf@hotmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
fix backoff error when using grpc forward

Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
tikv#314)

Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: birdstorm <samuelwyf@hotmail.com>

Co-authored-by: Little-Wallace <bupt2013211450@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
* update grpc version to 1.38.0

Signed-off-by: birdstorm <samuelwyf@hotmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: birdstorm <samuelwyf@hotmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
@marsishandsome marsishandsome force-pushed the feature/batch-cherry-pick branch from cc26c16 to 03f67f5 Compare December 1, 2021 03:45
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
marsishandsome and others added 3 commits December 1, 2021 13:37
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
@marsishandsome marsishandsome force-pushed the feature/batch-cherry-pick branch from a538f83 to 1b0d4e4 Compare December 1, 2021 05:49
@marsishandsome
Copy link
Copy Markdown
Collaborator Author

/run-all-tests

@marsishandsome marsishandsome changed the title support RawKV timeout (#292) Batch cherry pick from release-3.1 Dec 1, 2021
Copy link
Copy Markdown
Collaborator

@birdstorm birdstorm left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason
Copy link
Copy Markdown
Member

zz-jason commented Dec 1, 2021

/merge

@ti-srebot
Copy link
Copy Markdown
Collaborator

/run-all-tests

@ti-srebot ti-srebot merged commit 1886700 into tikv:master Dec 1, 2021
ankita25 pushed a commit to ankita25/client-java that referenced this pull request Dec 14, 2021
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
Signed-off-by: birdstorm <samuelwyf@hotmail.com>
Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>
Signed-off-by: Ankita Wagh <awagh@pinterest.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants