Merge pull request #15797 from ArtfulCoder/udpTimeoutFlag

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-22 22:52:40 -07:00
4 changed files with 49 additions and 42 deletions

View File

@@ -294,6 +294,7 @@ token-auth-file
ttl-secs
type-src
udp-port
udp-timeout
unix-socket
update-period
upgrade-target