Merge pull request #15433 from gnufied/fix-verify-volume-crash

Automatic merge from submit-queue (batch tested with PRs 15834, 16321, 16353, 15298, 15433) UPSTREAM: 49420: Fix c-m crash while verifying attached volumes Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1474441
openshift · Sep 18, 2017 · 38e59cf · 38e59cf
2 parents 79c3950 + aa890a3
commit 38e59cf
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go