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

[release-1.22] Refactor build_requests #1087

Closed
istio-testing opened this issue May 22, 2024 · 0 comments
Closed

[release-1.22] Refactor build_requests #1087

istio-testing opened this issue May 22, 2024 · 0 comments
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

#1082 failed to apply on top of branch "release-1.22":

Applying: wip
Using index info to reconstruct a base tree...
M	src/proxy.rs
M	src/proxy/inbound.rs
M	src/proxy/inbound_passthrough.rs
M	src/proxy/outbound.rs
M	src/state.rs
M	src/state/workload.rs
Falling back to patching base and 3-way merge...
Auto-merging src/state/workload.rs
Auto-merging src/state.rs
CONFLICT (content): Merge conflict in src/state.rs
Auto-merging src/proxy/outbound.rs
CONFLICT (content): Merge conflict in src/proxy/outbound.rs
Auto-merging src/proxy/inbound_passthrough.rs
Auto-merging src/proxy/inbound.rs
Auto-merging src/proxy.rs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 wip
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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

No branches or pull requests

2 participants