Merge pull request #11816 from sjenning/cherry-pick-36386

Merged by openshift-bot
openshift · Nov 9, 2016 · c04cab8 · c04cab8
2 parents f6072e5 + 24a0e77
commit c04cab8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go b/vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go