Merge remote branch 'origin/stable'

diff --cc src/rados.cc
index 6650ff30aa5e39832340f93a1b3fccdf7c3d4235,9c0a17b7dbacefb9320a2f9d753baa58fa1e91a4..004e955febb37b4648b905679af9a8b5a3c7ab01
--- 1/src/rados.cc
--- 2/src/rados.cc
+++ b/src/rados.cc
@@@ -1180,11 -1182,11 +1186,11 @@@ int main(int argc, const char **argv
        opts["target-throughput"] = val;
      } else if (ceph_argparse_witharg(args, i, &val, "--read-percent", (char*)NULL)) {
        opts["read-percent"] = val;
 -    } else if (ceph_argparse_witharg(args, i, &val, "--num-objs", (char*)NULL)) {
 -      opts["num-objs"] = val;
 +    } else if (ceph_argparse_witharg(args, i, &val, "--num-objects", (char*)NULL)) {
 +      opts["num-objects"] = val;
      } else {
        if (val[0] == '-')
-         usage();
+         usage_exit();
        i++;
      }
    }