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] Update PeerAuthentication docs #3250

Closed
istio-testing opened this issue Jul 2, 2024 · 1 comment
Closed

[release-1.22] Update PeerAuthentication docs #3250

istio-testing opened this issue Jul 2, 2024 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

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

Applying: Update PeerAuthentication docs for mTLS
Applying: update
Applying: update text
Applying: made gen
Applying: make gen
Applying: fix gencheck
Using index info to reconstruct a base tree...
A	security/v1/peer_authentication_alias.gen.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): security/v1/peer_authentication_alias.gen.go deleted in HEAD and modified in fix gencheck. Version fix gencheck of security/v1/peer_authentication_alias.gen.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 fix gencheck
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".

@craigbox
Copy link
Contributor

craigbox commented Jul 2, 2024

Do we bother with cherrypicking to release-1.22 for API docs?

@craigbox craigbox closed this as completed Jul 2, 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

2 participants