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.

Sign up for GitHub

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

Jump to bottom

Improve VS retry documentation #3247

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Improve VS retry documentation #3247

merged 3 commits into from
Jul 2, 2024
+42 −4

Conversation

howardjohn
Copy link
Member

Inspired by istio/istio#51762

@howardjohn howardjohn requested a review from a team as a code owner June 27, 2024 18:07
@howardjohn howardjohn added release-notes-none Indicates a PR that does not require release notes. cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch labels Jun 27, 2024
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 27, 2024
@howardjohn howardjohn mentioned this pull request Jun 27, 2024
Closed
2 tasks
@Stono
Copy link

Stono commented Jun 27, 2024

Lgtm!

@craigbox
Copy link
Contributor

craigbox commented Jul 2, 2024

cc @linsun @therealmitchconnors for TOC approval

@istio-testing istio-testing merged commit 5b3658a into istio:master Jul 2, 2024
5 checks passed
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #3247 failed to apply on top of branch "release-1.22":

Applying: Improve VS retry documentation
Applying: gen
Using index info to reconstruct a base tree...
A	networking/v1/virtual_service_alias.gen.go
M	networking/v1alpha3/virtual_service.pb.go
M	networking/v1alpha3/virtual_service.pb.html
A	networking/v1beta1/virtual_service_alias.gen.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): networking/v1beta1/virtual_service_alias.gen.go deleted in HEAD and modified in gen. Version gen of networking/v1beta1/virtual_service_alias.gen.go left in tree.
Auto-merging networking/v1alpha3/virtual_service.pb.html
Auto-merging networking/v1alpha3/virtual_service.pb.go
CONFLICT (modify/delete): networking/v1/virtual_service_alias.gen.go deleted in HEAD and modified in gen. Version gen of networking/v1/virtual_service_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 0002 gen
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".

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #3251

@istio-testing istio-testing mentioned this pull request Jul 2, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@therealmitchconnors therealmitchconnors therealmitchconnors approved these changes

@zirain zirain zirain approved these changes

@hzxuzhonghu hzxuzhonghu hzxuzhonghu approved these changes

@ramaraochavali ramaraochavali ramaraochavali approved these changes

Assignees
No one assigned
Labels
cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch release-notes-none Indicates a PR that does not require release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@howardjohn @Stono @craigbox @istio-testing @therealmitchconnors @zirain @hzxuzhonghu @ramaraochavali