Merge pull request #12556 from humblec/master

Merged by openshift-bot
openshift · Jan 20, 2017 · 2a936b6 · 2a936b6
2 parents 3a0e738 + 4947de6
commit 2a936b6
Show file tree

Hide file tree

Showing 4 changed files with 313 additions and 16 deletions.
diff --git a/...8s.io/kubernetes/examples/experimental/persistent-volume-provisioning/README.md b/...8s.io/kubernetes/examples/experimental/persistent-volume-provisioning/README.md
diff --git a/.../k8s.io/kubernetes/examples/experimental/persistent-volume-provisioning/glusterfs-dp.yaml b/.../k8s.io/kubernetes/examples/experimental/persistent-volume-provisioning/glusterfs-dp.yaml
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go