Merge pull request #18091 from humblec/volume-metrics

Automatic merge from submit-queue (batch tested with PRs 17992, 18091, 18118). UPSTREAM: 57993: Add volumemetrics for glusterfs plugin
openshift · Jan 16, 2018 · 7b30db8 · 7b30db8
2 parents ad95320 + 0c9994d
commit 7b30db8
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go