From: Sage Weil Date: Thu, 24 Oct 2019 02:05:42 +0000 (-0500) Subject: Merge PR #30859 into master X-Git-Tag: v15.1.0~1178 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29c97547a956469cbf089a705da70df83edb2b24;p=ceph.git Merge PR #30859 into master * refs/pull/30859/head: auth: EACCES, not EPERM mon: shunt old tell commands from cli interface to asok mon: allow mgr to tell mon.foo smart mon: include quorum features in quorum_status qa/workunits/mon/caps.sh: fix test ceph_test_rados_api_cmd: fix MonDescribe test Merge branch 'vstart-fs-auth' of git://github.com/batrick/ceph into wip-cleanup-mon-asok test/pybind/test_ceph_argparse: fix tests vstart: add volume client keys to keyring vstart: use fs authorize to create master client key vstart: redirect some output to stderr vstart: output command strings to stderr qa/workunits/cephtool/test.sh: fix 'quorum enter' caller qa: change mon_status calls to quorum_status or tell commands mon: fix 'heap ...' command mon: consolidate 'sync force' commands mon: allow asok commands to return an error code mon: move 'quorum enter|exit' and 'mon_status' to asok mon: fix 'smart' asok command mon: remove old 'config set' and 'injectargs' Reviewed-by: Josh Durgin --- 29c97547a956469cbf089a705da70df83edb2b24