c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix hierarchy misspellings

Browse Source 
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reported-by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Richard Laager <rlaager@wiktel.com>
Closes #8563
Closes #8622
This commit is contained in:
Richard Laager
2019-04-14 21:06:34 -05:00
committed by Brian Behlendorf
parent 703f791d35
commit 83472fabe5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/runfiles/linux.run
+1 -1
View File
@@ -803,7 +803,7 @@ tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
'send-c_lz4_disabled', 'send-c_recv_lz4_disabled',
'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-cD',
'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize',
'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_heirarchy',
'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_hierarchy',
'send_encrypted_props', 'send_freeobjects', 'send_realloc_dnode_size',
'send_realloc_files', 'send_holds', 'send_hole_birth', 'send_mixed_raw',
'send-wDR_encrypted_zvol']
tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
+1 -1
View File
@@ -135,7 +135,7 @@ for obj in $child_fs $child_fs1 $ctr $ctr1; do
log_mustnot zfs destroy -r $obj
datasetexists $obj || \
log_fail "'zfs destroy -r' fails to keep dependent " \
"clone outside the hirearchy."
"clone outside the hierarchy."
done
tests/zfs-tests/tests/functional/rsend/Makefile.am
+1 -1
View File
@@ -22,7 +22,7 @@ dist_pkgdata_SCRIPTS = \
rsend_022_pos.ksh \
rsend_024_pos.ksh \
send_encrypted_files.ksh \
send_encrypted_heirarchy.ksh \
send_encrypted_hierarchy.ksh \
send_encrypted_props.ksh \
send-cD.ksh \
send-c_embedded_blocks.ksh \
tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh → tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
+2 -2
View File
@@ -46,7 +46,7 @@ function cleanup
log_assert "Raw recursive sends preserve filesystem structure."
log_onexit cleanup
# Create the filesystem heirarchy
# Create the filesystem hierarchy
log_must cleanup_pool $POOL
log_must eval "echo $PASSPHRASE | zfs create -o encryption=on" \
"-o keyformat=passphrase $POOL/$FS"
@@ -72,7 +72,7 @@ log_must verify_origin $POOL/clone "$POOL/$FS@snap"
log_must verify_encryption_root $POOL/$FS/child $POOL/$FS
log_must verify_keylocation $POOL/$FS/child "none"
# Alter the heirarchy and re-send
# Alter the hierarchy and re-send
log_must eval "echo $PASSPHRASE1 | zfs change-key -o keyformat=passphrase" \
"$POOL/$FS/child"
log_must zfs promote $POOL/clone