From: Jianpeng Ma Date: Mon, 4 May 2015 02:54:00 +0000 (+0800) Subject: rbd: updated the 'rbd --help' X-Git-Tag: v9.0.1~22^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c60212b21aa9993aa9d1c59fda891a4ec2f2300f;p=ceph.git rbd: updated the 'rbd --help' Now default format is 2. update 'rbd --help'. Signed-off-by: Jianpeng Ma --- diff --git a/src/rbd.cc b/src/rbd.cc index f43512cde613f..2d46bea0af2ae 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -168,8 +168,8 @@ void usage() " --order the object size in bits; object size will be\n" " (1 << order) bytes. Default is 22 (4 MB).\n" " --image-format format to use when creating an image\n" -" format 1 is the original format (default)\n" -" format 2 supports cloning\n" +" format 1 is the original format\n" +" format 2 supports cloning (default)\n" " --image-feature optional format 2 feature to enable.\n" " use multiple times to enable multiple features\n" " --image-shared image will be used concurrently (disables\n" @@ -2753,7 +2753,7 @@ int main(int argc, const char **argv) int order = 0; bool format_specified = false, output_format_specified = false; - int format = 1; + int format = 2; uint64_t features = 0; bool shared = false; diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index 4556ed7079c29..7ec32e997ee5b 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -80,8 +80,8 @@ --order the object size in bits; object size will be (1 << order) bytes. Default is 22 (4 MB). --image-format format to use when creating an image - format 1 is the original format (default) - format 2 supports cloning + format 1 is the original format + format 2 supports cloning (default) --image-feature optional format 2 feature to enable. use multiple times to enable multiple features --image-shared image will be used concurrently (disables