Merge pull request #19389 from justinsb/internal_cidr

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-26 03:58:48 -08:00
16 changed files with 797 additions and 693 deletions

View File

@@ -237,6 +237,7 @@ node-name
node-startup-grace-period
node-status-update-frequency
node-sync-period
non-masquerade-cidr
num-nodes
oidc-ca-file
oidc-client-id