Skip to content

Remove non-zero requirement on connectionPool.tcp.IdleTimeout #3455

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

Merged
merged 1 commit into from
Mar 7, 2025

Conversation

leosarra
Copy link
Contributor

@leosarra leosarra commented Mar 7, 2025

Follow-up of istio/istio#55410

@leosarra leosarra requested a review from a team as a code owner March 7, 2025 17:26
@istio-policy-bot
Copy link

😊 Welcome @leosarra! This is either your first contribution to the Istio api repo, or it's been
a while since you've been here.

You can learn more about the Istio working groups, Code of Conduct, and contribution guidelines
by referring to Contributing to Istio.

Thanks for contributing!

Courtesy of your friendly welcome wagon.

@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 7, 2025
@leosarra leosarra added cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch cherrypick/release-1.25 Set this label on a PR to auto-merge it to the release-1.25 branch release-notes-none Indicates a PR that does not require release notes. labels Mar 7, 2025
@istio-testing istio-testing merged commit 041c225 into istio:master Mar 7, 2025
5 checks passed
@istio-testing
Copy link
Collaborator

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

Applying: Remove non-zero requirement on connectionPool.tcp.IdleTimeout
Using index info to reconstruct a base tree...
M	kubernetes/customresourcedefinitions.gen.yaml
M	networking/v1alpha3/destination_rule.pb.go
M	networking/v1alpha3/destination_rule.proto
Falling back to patching base and 3-way merge...
Auto-merging networking/v1alpha3/destination_rule.proto
Auto-merging networking/v1alpha3/destination_rule.pb.go
CONFLICT (content): Merge conflict in networking/v1alpha3/destination_rule.pb.go
Auto-merging kubernetes/customresourcedefinitions.gen.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Remove non-zero requirement on connectionPool.tcp.IdleTimeout

@istio-testing
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Remove non-zero requirement on connectionPool.tcp.IdleTimeout
Using index info to reconstruct a base tree...
M	kubernetes/customresourcedefinitions.gen.yaml
M	networking/v1alpha3/destination_rule.pb.go
M	networking/v1alpha3/destination_rule.proto
Falling back to patching base and 3-way merge...
Auto-merging networking/v1alpha3/destination_rule.proto
Auto-merging networking/v1alpha3/destination_rule.pb.go
CONFLICT (content): Merge conflict in networking/v1alpha3/destination_rule.pb.go
Auto-merging kubernetes/customresourcedefinitions.gen.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Remove non-zero requirement on connectionPool.tcp.IdleTimeout

@istio-testing
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new pull request created: #3458

leosarra added a commit to Nordix/api that referenced this pull request Mar 7, 2025
leosarra added a commit to Nordix/api that referenced this pull request Mar 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch cherrypick/release-1.25 Set this label on a PR to auto-merge it to the release-1.25 branch release-notes-none Indicates a PR that does not require release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants