Merge "After the addition of ZFSSA NFS driver, the configuration table xml file for zfssa needs to be split into two separate files, so that documentation for iSCSI and NFS drivers can reference them separately. The documentation for ZFSSA NFS driver will be submitted as part of another patch."

This commit is contained in:
Jenkins 2015-01-06 05:49:18 +00:00 committed by Gerrit Code Review
commit 96889534bb
2 changed files with 10 additions and 9 deletions

View File

@ -493,8 +493,8 @@ zadara_vpsa_ip zadara
zadara_vpsa_poolname zadara
zadara_vpsa_port zadara
zadara_vpsa_use_ssl zadara
zfssa_data_ip zfssa
zfssa_https_port zfssa
zfssa_data_ip zfssa-nfs
zfssa_https_port zfssa-nfs
zfssa_initiator zfssa
zfssa_initiator_config zfssa
zfssa_initiator_group zfssa
@ -504,15 +504,15 @@ zfssa_lun_compression zfssa
zfssa_lun_logbias zfssa
zfssa_lun_sparse zfssa
zfssa_lun_volblocksize zfssa
zfssa_nfs_mount_options zfssa
zfssa_nfs_pool zfssa
zfssa_nfs_project zfssa
zfssa_nfs_share zfssa
zfssa_nfs_share_compression zfssa
zfssa_nfs_share_logbias zfssa
zfssa_nfs_mount_options zfssa-nfs
zfssa_nfs_pool zfssa-nfs
zfssa_nfs_project zfssa-nfs
zfssa_nfs_share zfssa-nfs
zfssa_nfs_share_compression zfssa-nfs
zfssa_nfs_share_logbias zfssa-nfs
zfssa_pool zfssa
zfssa_project zfssa
zfssa_rest_timeout zfssa
zfssa_rest_timeout zfssa zfssa-nfs
zfssa_target_group zfssa
zfssa_target_interfaces zfssa
zfssa_target_password zfssa

View File

@ -50,6 +50,7 @@ windows Windows
xiv IBM XIV and DS8000 volume driver
zadara Zadara Storage driver
zfssa ZFS Storage Appliance iSCSI driver
zfssa-nfs ZFS Storage Appliance NFS driver
zones zones
zoning zoning
zoning_fabric zoning fabrics