Skip to content

Commit a324f1a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents e5559f0 + 5225530 commit a324f1a

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

‎vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)