From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 1 Jul 2021 17:47:30 +0000 (-0700)
Subject: Merge pull request #41617 from cfsnyder/wip-50167-octopus
X-Git-Tag: v15.2.14~54
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ef82a521e2d7a58c9977b023f5ad70e58f2055d8;p=ceph.git

Merge pull request #41617 from cfsnyder/wip-50167-octopus

octopus: mgr: do not load disabled modules

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
---

ef82a521e2d7a58c9977b023f5ad70e58f2055d8