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.18] wasm: add fail_open for telemetry plugins #2801

Closed
istio-testing opened this issue Jun 2, 2023 · 1 comment
Closed

[release-1.18] wasm: add fail_open for telemetry plugins #2801

istio-testing opened this issue Jun 2, 2023 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#2799 failed to apply on top of branch "release-1.18":

Applying: wasm: add fail_open for telemetry plugins
Using index info to reconstruct a base tree...
M	extensions/v1alpha1/wasm.pb.go
M	extensions/v1alpha1/wasm.pb.html
M	extensions/v1alpha1/wasm.proto
M	kubernetes/customresourcedefinitions.gen.yaml
M	proto.lock
Falling back to patching base and 3-way merge...
Auto-merging proto.lock
Auto-merging kubernetes/customresourcedefinitions.gen.yaml
Auto-merging extensions/v1alpha1/wasm.proto
Auto-merging extensions/v1alpha1/wasm.pb.html
Auto-merging extensions/v1alpha1/wasm.pb.go
CONFLICT (content): Merge conflict in extensions/v1alpha1/wasm.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 wasm: add fail_open for telemetry plugins
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".

@ericvn
Copy link
Contributor

ericvn commented Jun 13, 2023

Assign to Kuat as owner of the original PR.

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

4 participants