Merge pull request #17222 from knobunc/fix/increase-iptables-wait

Automatic merge from submit-queue. UPSTREAM: 55248: increase iptables max wait from 2 seconds to 5 (fix) 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
openshift · Nov 8, 2017 · 04a02a6 · 04a02a6
2 parents a133c41 + c4de29c
commit 04a02a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go b/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go b/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go