Merge pull request #14457 from rootfs/pr-46239

Merged by openshift-bot
openshift · Jun 3, 2017 · 663ad03 · 663ad03
2 parents 64eccce + 301d366
commit 663ad03
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 47 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/iscsi/iscsi.go b/vendor/k8s.io/kubernetes/pkg/volume/iscsi/iscsi.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util.go b/vendor/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util_test.go b/vendor/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util_test.go