Merge pull request #19142 from gmarek/grab-metrics

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-30 01:44:28 -08:00
7 changed files with 302 additions and 211 deletions

View File

@@ -237,6 +237,7 @@ oidc-username-claim
oom-score-adj
output-base
output-package
output-print-type
output-version
out-version
path-override