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

UPSTREAM: 55248: increase iptables max wait from 2 seconds to 5 (fix) #17222

Merged

Conversation

knobunc
Copy link
Contributor

@knobunc knobunc commented Nov 7, 2017

There were a few more places that had a different form of the wait argument. This catches those places and makes them use the same constant.

https://bugzilla.redhat.com/show_bug.cgi?id=1506396

Upstream PR kubernetes/kubernetes#55248

There were a few more places that had a different form of the wait argument.  This catches those places and makes them use the same constant.

https://bugzilla.redhat.com/show_bug.cgi?id=1506396

Upstream PR kubernetes/kubernetes#55248
@knobunc knobunc self-assigned this Nov 7, 2017
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 7, 2017
@knobunc
Copy link
Contributor Author

knobunc commented Nov 7, 2017

@openshift/networking PTAL

@knobunc
Copy link
Contributor Author

knobunc commented Nov 7, 2017

/test all

@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Nov 7, 2017
@knobunc
Copy link
Contributor Author

knobunc commented Nov 7, 2017

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Nov 7, 2017
Copy link
Contributor

@rajatchopra rajatchopra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2017
@dcbw
Copy link
Contributor

dcbw commented Nov 7, 2017

/approve
/lgtm

@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, knobunc, rajatchopra

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2017
@knobunc
Copy link
Contributor Author

knobunc commented Nov 7, 2017

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 04a02a6 into openshift:master Nov 8, 2017
@knobunc knobunc deleted the fix/increase-iptables-wait branch June 7, 2018 12:39
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. component/networking kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants