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.20] add fallback support for PrivateKeyProvider #3053

Closed
istio-testing opened this issue Jan 17, 2024 · 1 comment
Closed

[release-1.20] add fallback support for PrivateKeyProvider #3053

istio-testing opened this issue Jan 17, 2024 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#3045 failed to apply on top of branch "release-1.20":

Applying: add fallback support for privatekeyprovider
Using index info to reconstruct a base tree...
M	annotation/annotations.pb.html
M	label/labels.pb.html
M	mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
M	mesh/v1alpha1/proxy.pb.go
M	mesh/v1alpha1/proxy.proto
M	proto.lock
Falling back to patching base and 3-way merge...
Auto-merging proto.lock
Auto-merging mesh/v1alpha1/proxy.proto
Auto-merging mesh/v1alpha1/proxy.pb.go
Auto-merging mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Auto-merging annotation/annotations.pb.html
CONFLICT (content): Merge conflict in annotation/annotations.pb.html
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add fallback support for privatekeyprovider
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".

@zirain
Copy link
Member

zirain commented Jan 18, 2024

duplicate with #3054

@zirain zirain closed this as completed Jan 18, 2024
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