Merge pull request #16236 from rootfs/49416

Automatic merge from submit-queue (batch tested with PRs 15199, 16276, 16236) UPSTREAM: 49416: FC volume plugin: remove block device at DetachDisk fix https://bugzilla.redhat.com/show_bug.cgi?id=1473855 @mtanino @openshift/sig-storage
openshift · Sep 11, 2017 · db2d00f · db2d00f
2 parents a2815da + e1a2e24
commit db2d00f
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/fc/attacher.go b/vendor/k8s.io/kubernetes/pkg/volume/fc/attacher.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/fc/disk_manager.go b/vendor/k8s.io/kubernetes/pkg/volume/fc/disk_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/fc/fc_util.go b/vendor/k8s.io/kubernetes/pkg/volume/fc/fc_util.go