Merge pull request #20154 from sjenning/check-empty-volume-config-file

UPSTREAM: <carry>: gracefully handle empty volume-config file
openshift · Jul 29, 2018 · b801072 · b801072
2 parents 757e2a8 + a5fade4
commit b801072
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/patch_volumequota.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/patch_volumequota.go