Merge pull request #17958 from sils1297/patch-1

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-19 17:15:37 -08:00
commit 501f770401

View File

@ -274,12 +274,10 @@ spec:
- name: test-volume - name: test-volume
# This AWS EBS volume must already exist. # This AWS EBS volume must already exist.
awsElasticBlockStore: awsElasticBlockStore:
volumeID: aws://<availability-zone>/<volume-id> volumeID: <volume-id>
fsType: ext4 fsType: ext4
``` ```
(Note: the syntax of volumeID is currently awkward; #10181 fixes it)
### nfs ### nfs
An `nfs` volume allows an existing NFS (Network File System) share to be An `nfs` volume allows an existing NFS (Network File System) share to be