Merge pull request #22293 from dchen1107/test

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-02 03:35:05 -08:00
9 changed files with 628 additions and 560 deletions

View File

@@ -22,6 +22,7 @@ authorization-mode
authorization-policy-file
authorization-webhook-config-file
basic-auth-file
babysit-daemons
bench-pods
bench-quiet
bench-tasks