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

client: fix confusing error (#9050) #9061

Merged
merged 2 commits into from
Feb 11, 2025
Merged

client: fix confusing error (#9050) #9061

merged 2 commits into from
Feb 11, 2025

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #9050

What problem does this PR solve?

Issue Number: Close #9036

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Feb 11, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 11, 2025
Merged
@ti-chi-bot
Copy link
Member Author

@rleungx This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/cherry-pick-not-approved size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 11, 2025
@rleungx
resolve conflicts
5c4768a 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx rleungx force-pushed the cherry-pick-9050-to-release-6.5 branch from 07e0bd1 to 5c4768a Compare February 11, 2025 06:38
@rleungx
Copy link
Member

rleungx commented Feb 11, 2025

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2025
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Feb 11, 2025
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 11, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Feb 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lhy1024, rleungx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Feb 11, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-02-11 06:44:53.652708914 +0000 UTC m=+338936.048930970: ☑️ agreed by lhy1024.
  • 2025-02-11 08:10:29.627453463 +0000 UTC m=+344072.023675521: ☑️ agreed by rleungx.

@ti-chi-bot ti-chi-bot bot merged commit e19478d into tikv:release-6.5 Feb 11, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@rleungx rleungx rleungx approved these changes

Assignees

@rleungx rleungx

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @rleungx @lhy1024