Merge pull request #19741 from pwittrock/syncfsmetrics

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 17:54:22 -08:00
24 changed files with 2030 additions and 1130 deletions

View File

@@ -363,6 +363,7 @@ use-kubernetes-cluster-service
user-whitelist
verify-only
volume-plugin-dir
volume-stats-agg-period
watch-cache
watch-only
whitelist-override-label