]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39702 into pacific
authorSage Weil <sage@newdream.net>
Fri, 5 Mar 2021 20:35:15 +0000 (14:35 -0600)
committerSage Weil <sage@newdream.net>
Fri, 5 Mar 2021 20:35:15 +0000 (14:35 -0600)
* refs/pull/39702/head:
mon: simplify fs 'services' view of 'ceph status'
mds: add volumes + status to data: section of 'ceph status'

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/Monitor.cc

Simple merge