Merge pull request #20796 from smarterclayton/parallel_test

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-08 08:22:09 -08:00
4 changed files with 5 additions and 2 deletions

View File

@@ -364,6 +364,7 @@ upgrade-target
use-kubernetes-cluster-service
user-whitelist
verify-only
volume-dir
volume-plugin-dir
volume-stats-agg-period
watch-cache