Merge pull request #19182 from thockin/kube-proxy-conntrack-max

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-02 02:36:18 -08:00
5 changed files with 113 additions and 35 deletions

View File

@@ -51,6 +51,8 @@ concurrent-endpoint-syncs
concurrent-resource-quota-syncs
config-sync-period
configure-cbr0
conntrack-max
conntrack-tcp-timeout-established
container-port
container-runtime
contain-pod-resources