Skip to content

[release-4.6] Set TCP_USER_TIMEOUT socket option#937

Merged
openshift-merge-robot merged 3 commits intoopenshift:release-4.6from
openshift-cherrypick-robot:cherry-pick-926-to-release-4.6
Nov 9, 2020
Merged

[release-4.6] Set TCP_USER_TIMEOUT socket option#937
openshift-merge-robot merged 3 commits intoopenshift:release-4.6from
openshift-cherrypick-robot:cherry-pick-926-to-release-4.6

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #926

/assign p0lyn0mial

@p0lyn0mial
Copy link
Contributor

/assign @sttts

@sttts
Copy link
Contributor

sttts commented Nov 9, 2020

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 9, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, sttts

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2020
@openshift-merge-robot openshift-merge-robot merged commit b4f294b into openshift:release-4.6 Nov 9, 2020
@p0lyn0mial
Copy link
Contributor

/cherry-pick release-4.5

@openshift-cherrypick-robot
Copy link
Author

@p0lyn0mial: #937 failed to apply on top of branch "release-4.5":

Applying: provides DefaultClientDialer that returns a network dialer with default options sets.
Applying: go mod vendor
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 go mod vendor
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".

Details

In response to this:

/cherry-pick release-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants