From: Nathan Cutler <ncutler@suse.com>
Date: Sun, 28 Jan 2018 10:31:26 +0000 (+0100)
Subject: tools: rados: make -f be --format instead of --force
X-Git-Tag: v13.0.2~284^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=182b519c9bd50c01c59e1935f9fada574c59fd88;p=ceph.git

tools: rados: make -f be --format instead of --force

Fixes: http://tracker.ceph.com/issues/15904
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index b87b19194dd..2b6843e5aea 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -173,6 +173,8 @@ void usage(ostream& out)
 "        select given pool by name\n"
 "   --target-pool=pool\n"
 "        select target pool by name\n"
+"   -f [--format plain|json|json-pretty]\n"
+"   --format=[--format plain|json|json-pretty]\n"
 "   -b op_size\n"
 "        set the block size for put/get ops and for write benchmarking\n"
 "   -o object_size\n"
@@ -3806,7 +3808,7 @@ int main(int argc, const char **argv)
       opts["run-length"] = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--workers", (char*)NULL)) {
       opts["workers"] = val;
-    } else if (ceph_argparse_witharg(args, i, &val, "--format", (char*)NULL)) {
+    } else if (ceph_argparse_witharg(args, i, &val, "-f", "--format", (char*)NULL)) {
       opts["format"] = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--lock-tag", (char*)NULL)) {
       opts["lock-tag"] = val;