From: Kefu Chai Date: Wed, 24 Jul 2019 06:18:50 +0000 (+0800) Subject: Merge pull request #29073 from dillaman/wip-40790 X-Git-Tag: v15.1.0~2101 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=af6c4877582c73de0948082da4194360126ec0fa;p=ceph-ci.git Merge pull request #29073 from dillaman/wip-40790 mon/mgr: add 'rbd_support' to list of always-on mgr modules Reviewed-by: Mykola Golub --- af6c4877582c73de0948082da4194360126ec0fa diff --cc src/mon/MgrMonitor.cc index 8f3dcd05556,b6ff4a0d917..fb8fe4ea08e --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@@ -59,8 -60,8 +60,9 @@@ const static std::map