Merged master into release-1.10 and resolved merge conflicts.

2018-03-13 16:36:07 -07:00
parent 1500d69283 b34babb518
commit 021502d2a6
18 changed files with 183 additions and 258 deletions
@@ -70,6 +70,7 @@ Kubernetes supports several types of Volumes:
   * `azureFile`
   * `cephfs`
   * `configMap`
+   * `csi`
   * `downwardAPI`
   * `emptyDir`
   * `fc` (fibre channel)