Merge pull request #17062 from rajatchopra/iptables-wait

Automatic merge from submit-queue (batch tested with PRs 17105, 17036, 17062, 17093). UPSTREAM: 54763: increase iptables max wait from 2 seconds to 5 seconds https://bugzilla.redhat.com/show_bug.cgi?id=1506396 Upstream PR kubernetes/kubernetes#54763
openshift · Oct 31, 2017 · a324f1a · a324f1a
2 parents e5559f0 + 5225530
commit a324f1a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 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