Merge pull request #20796 from smarterclayton/parallel_test

Auto commit by PR queue bot
2016-02-08 08:22:09 -08:00
parent f93d9304a4 e8cbb762e2
commit 807e5f08d0
4 changed files with 5 additions and 2 deletions
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -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