]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32939 into master
authorSage Weil <sage@redhat.com>
Wed, 29 Jan 2020 13:46:38 +0000 (07:46 -0600)
committerSage Weil <sage@redhat.com>
Wed, 29 Jan 2020 13:46:38 +0000 (07:46 -0600)
* refs/pull/32939/head:
mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls"

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge