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] Wasm Configuration for Ambient Mode - Updates #15166

Open
istio-testing opened this issue May 22, 2024 · 1 comment
Open

[release-1.22] Wasm Configuration for Ambient Mode - Updates #15166

istio-testing opened this issue May 22, 2024 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

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

Applying: updated docs and test
.git/rebase-apply/patch:19: trailing whitespace.
      group: ""                       
.git/rebase-apply/patch:36: trailing whitespace.
      group: ""                       
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 updated docs and test
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".

@kfaseela
Copy link
Member

@adilmp1 please cherrypick this manually

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

3 participants