Merge pull request #15053 from smarterclayton/stdin_once

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-17 00:03:32 -07:00
25 changed files with 22721 additions and 22482 deletions

View File

@@ -149,6 +149,7 @@ kubelet-timeout
kube-master
label-columns
last-release-pr
leave-stdin-open
limit-bytes
load-balancer-ip
log-flush-frequency