Merge pull request #15682 from smarterclayton/make_proxy_resync_longer

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-16 20:30:36 -07:00
2 changed files with 10 additions and 6 deletions

View File

@@ -46,6 +46,7 @@ cluster-domain
cluster-name
cluster-tag
concurrent-endpoint-syncs
config-sync-period
configure-cbr0
contain-pod-resources
container-port