Merge pull request #20496 from matthewdupre/masquerade-config

Auto commit by PR queue bot
2016-02-08 10:49:20 -08:00
parent 3bbf55d38b 9925cddc11
commit b32078d89b
15 changed files with 2690 additions and 2364 deletions
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -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