Merge tag 'v13.0.2'

v13.0.2

diff --cc CMakeLists.txt
Simple merge

diff --cc src/ceph_fuse.cc
index a6295e2b2d7615ed4d4cfb70f55a4f9540aa74fd,916217bead7ef962e6cf6b7fdaae8735c857f132..f271239493adf6865203d2c4b352990dce3e0f83
--- 1/src/ceph_fuse.cc
--- 2/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@@ -93,21 -100,6 +98,19 @@@ int main(int argc, const char **argv, c
      } else if (ceph_argparse_flag(args, i, "--localize-reads", (char*)nullptr)) {
        cerr << "setting CEPH_OSD_FLAG_LOCALIZE_READS" << std::endl;
        filer_flags |= CEPH_OSD_FLAG_LOCALIZE_READS;
-     } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)nullptr)) {
-       usage();
 +    } else if (ceph_argparse_flag(args, i, "-V", (char*)nullptr)) {
 +      const char* tmpargv[] = {
 +      "ceph-fuse",
 +      "-V"
 +      };
 +
 +      struct fuse_args fargs = FUSE_ARGS_INIT(2, (char**)tmpargv);
 +      if (fuse_parse_cmdline(&fargs, nullptr, nullptr, nullptr) == -1) {
 +       derr << "fuse_parse_cmdline failed." << dendl;
 +      }
 +      assert(fargs.allocated);
 +      fuse_opt_free_args(&fargs);
 +      exit(0);
      } else {
        ++i;
      }

diff --cc src/common/options.cc
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_main.cc
Simple merge

diff --cc src/test/cli/ceph-authtool/help.t
Simple merge

diff --cc src/test/cli/radosgw-admin/help.t
Simple merge

diff --cc src/tools/ceph_authtool.cc
Simple merge

diff --cc src/tools/monmaptool.cc
Simple merge

diff --cc src/tools/rbd_nbd/rbd-nbd.cc
Simple merge