Merge pull request #5551 from smarterclayton/storage_upstream

Merged by openshift-bot
openshift · Nov 2, 2015 · 530de5d · 530de5d
2 parents 4d58cb4 + b356fb0
commit 530de5d
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 48 deletions.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/mount/mount_linux.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/mount/mount_linux.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs_test.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs_test.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_test.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_test.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util_test.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/iscsi/iscsi_util_test.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/nfs/nfs.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/volume/nfs/nfs.go