Merge pull request #19783 from magicwang-cn/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 08:53:30 -08:00
23 changed files with 143 additions and 19 deletions

View File

@@ -375,3 +375,4 @@ leader-elect
leader-elect-lease-duration
leader-elect-renew-deadline
leader-elect-retry-period
watch-cache-sizes