]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #30859 into master
authorSage Weil <sage@redhat.com>
Thu, 24 Oct 2019 02:05:42 +0000 (21:05 -0500)
committerSage Weil <sage@redhat.com>
Thu, 24 Oct 2019 02:05:42 +0000 (21:05 -0500)
* 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 <jdurgin@redhat.com>
1  2 
PendingReleaseNotes
qa/tasks/ceph_manager.py
qa/workunits/mon/caps.py
src/auth/cephx/CephxClientHandler.cc
src/auth/cephx/CephxServiceHandler.cc
src/ceph.in
src/osd/OSD.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/ceph.in
Simple merge
diff --cc src/osd/OSD.cc
Simple merge