Merge pull request #19944 from mwielgus/simple-cm

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 06:41:28 -08:00
13 changed files with 1007 additions and 839 deletions

View File

@@ -86,6 +86,7 @@ dry-run
duration-sec
e2e-output-dir
e2e-verify-service-account
enable-custom-metrics
enable-debugging-handlers
enable-hostpath-provisioner
enable-server