]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit4fa9397841210ed567dc040037dda9f0b3719d89
tree47ce2131fad15ce62373b2391aac6bab2fc6b128
parent115148e126ee4208425c81df5e27a90492a36b60
parent8aa3c65b56add413d3fba1cb1d0cf84a10bfcf3c
Merge PR #32939 into master

* 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>