At Fri, 15 Aug 2014 18:06:10 +0800, Ruoyu wrote: > > Signed-off-by: Ruoyu <lian...@ucweb.com> > --- > tests/functional/039.out | 10 +++++----- > tests/functional/096.out | 8 ++++---- > 2 files changed, 9 insertions(+), 9 deletions(-)
Applied, thanks. Hitoshi > > diff --git a/tests/functional/039.out b/tests/functional/039.out > index c28a49c..5f5158b 100644 > --- a/tests/functional/039.out > +++ b/tests/functional/039.out > @@ -4,7 +4,7 @@ wrote 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > wrote 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > -This operation dicards any changes made since the previous > +This operation discards any changes made since the previous > snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > test---[DATE]---(you are here) > @@ -15,7 +15,7 @@ wrote 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > wrote 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > -This operation dicards any changes made since the previous > +This operation discards any changes made since the previous > snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > test---[DATE]-+-[DATE] > @@ -24,7 +24,7 @@ test---[DATE]-+-[DATE] > s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1 > s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap2 > test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b29 6 > -This operation dicards any changes made since the previous > +This operation discards any changes made since the previous > snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > test---[DATE]---[DATE]---(you are here) > @@ -32,7 +32,7 @@ test---[DATE]---[DATE]---(you are here) > s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1 > s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap2 > test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2a 6 > -This operation dicards any changes made since the previous > +This operation discards any changes made since the previous > snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > test---[DATE]-+-[DATE] > @@ -48,7 +48,7 @@ wrote 512/512 bytes at offset 0 > The snapshot id must be larger than zero > Cannot get VDI info for test 5 : Failed to find requested tag > Failed to open VDI test > -This operation dicards any changes made since the previous > +This operation discards any changes made since the previous > snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0 > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > test---[DATE]-+-[DATE] > diff --git a/tests/functional/096.out b/tests/functional/096.out > index 55fc33a..9ac87b9 100644 > --- a/tests/functional/096.out > +++ b/tests/functional/096.out > @@ -58,12 +58,12 @@ The cluster's redundancy level is already set to 3, > nothing changed. > > $ ../../dog/dog cluster alter-copy -c 4:2 > Changing redundancy level of erasure coded vdi is not supported yet. > -Usage: dog cluster alter-copy [-a address] [-p port] [-h] [-t] [-c copies] > +Usage: dog cluster alter-copy [-a address] [-p port] [-h] [-T] [-c copies] > Options: > -a, --address specify the daemon address (default: localhost) > -p, --port specify the daemon port > -h, --help display this help and exit > - -t, --time show elapsed time > + -T, --time show elapsed time > -c, --copies specify the default data redundancy (number of > copies) > > ----- > @@ -131,13 +131,13 @@ test's redundancy level is already set to 2, nothing > changed. > > $ ../../dog/dog vdi alter-copy test -c 4:2 > Changing redundancy level of erasure coded vdi is not supported yet. > -Usage: dog vdi alter-copy [-c copies] [-a address] [-p port] [-h] [-t] > <vdiname> > +Usage: dog vdi alter-copy [-c copies] [-a address] [-p port] [-h] [-T] > <vdiname> > Options: > -c, --copies specify the data redundancy level > -a, --address specify the daemon address (default: localhost) > -p, --port specify the daemon port > -h, --help display this help and exit > - -t, --time show elapsed time > + -T, --time show elapsed time > > ----- > > -- > 1.8.3.2 > > > -- > sheepdog mailing list > sheepdog@lists.wpkg.org > http://lists.wpkg.org/mailman/listinfo/sheepdog -- sheepdog mailing list sheepdog@lists.wpkg.org http://lists.wpkg.org/mailman/listinfo/sheepdog
