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] Test sandwiched waypoint #976

Closed
istio-testing opened this issue Apr 25, 2024 · 1 comment
Closed

[release-1.22] Test sandwiched waypoint #976

istio-testing opened this issue Apr 25, 2024 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

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

Applying: Test sandwich waypoints
Using index info to reconstruct a base tree...
M	src/proxy/outbound.rs
M	src/test_helpers/linux.rs
M	src/test_helpers/tcp.rs
M	tests/namespaced.rs
Falling back to patching base and 3-way merge...
Auto-merging tests/namespaced.rs
CONFLICT (content): Merge conflict in tests/namespaced.rs
Auto-merging src/test_helpers/tcp.rs
Auto-merging src/test_helpers/linux.rs
CONFLICT (content): Merge conflict in src/test_helpers/linux.rs
Auto-merging src/proxy/outbound.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 Test sandwich waypoints
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".

@howardjohn
Copy link
Member

#983

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