Merge pull request #13017 from jsafrane/rbd-error

Merged by openshift-bot
openshift · Mar 27, 2017 · d2f95a1 · d2f95a1
2 parents 9b26d5a + 327f4ce
commit d2f95a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/rbd/rbd.go b/vendor/k8s.io/kubernetes/pkg/volume/rbd/rbd.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/rbd/rbd_util.go b/vendor/k8s.io/kubernetes/pkg/volume/rbd/rbd_util.go