Skip to content
New issue

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

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

Already on GitHub? # to your account

[BugFix] fix 100-continue compatibility issue for HTTP/1.0 (backport #53008) #53023

Merged
merged 2 commits into from
Nov 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2024

Why I'm doing:

What I'm doing:

Fixes #52998

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #53008 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

Fixes #52998

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
(cherry picked from commit bf78f6e)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/http/rest/LoadAction.java
#	fe/fe-core/src/test/java/com/starrocks/http/LoadActionTest.java
@mergify mergify bot added the conflicts label Nov 20, 2024
Copy link
Contributor Author

mergify bot commented Nov 20, 2024

Cherry-pick of bf78f6e has failed:

On branch mergify/bp/branch-3.3/pr-53008
Your branch is up to date with 'origin/branch-3.3'.

You are currently cherry-picking commit bf78f6e38d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/http/rest/LoadAction.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/http/LoadActionTest.java

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Nov 20, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
@kevincai kevincai reopened this Nov 20, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 20, 2024 02:04
@wanpengfei-git wanpengfei-git merged commit 92100a6 into branch-3.3 Nov 20, 2024
35 of 36 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-53008 branch November 20, 2024 02:46
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants