Merge pull request #15427 from brendandburns/controllerversion

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-15 05:38:33 -07:00
9 changed files with 315 additions and 54 deletions

View File

@@ -71,7 +71,6 @@ duration-sec
e2e-verify-service-account
e2e-output-dir
enable-debugging-handlers
enable-experimental
enable-server
etcd-config
etcd-prefix