Merge pull request #20496 from matthewdupre/masquerade-config

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-08 10:49:20 -08:00
15 changed files with 2690 additions and 2364 deletions

View File

@@ -148,6 +148,7 @@ input-dirs
insecure-bind-address
insecure-port
insecure-skip-tls-verify
iptables-masquerade-bit
iptables-sync-period
ir-data-source
ir-dbname