Merge pull request #18225 from humblec/kubelet-mount-fix

Automatic merge from submit-queue (batch tested with PRs 18225, 18351, 18331, 18340, 18326). UPSTREAM: 52324: Fix bug on kubelet failure to umount mount points.
openshift · Jan 31, 2018 · f2b1e42 · f2b1e42
2 parents 971bf1c + 0727d1d
commit f2b1e42
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 18 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/util_test.go b/vendor/k8s.io/kubernetes/pkg/volume/util/util_test.go