From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 18 Mar 2021 16:16:07 +0000 (-0700)
Subject: Merge pull request #39341 from smithfarm/wip-48898-octopus
X-Git-Tag: v15.2.13~2^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32ff6259518e454687499bcc4edcf2b3bc37ecd4;p=ceph.git

Merge pull request #39341 from smithfarm/wip-48898-octopus

octopus: mgr: fix deadlock in ActivePyModules::get_osdmap()

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

32ff6259518e454687499bcc4edcf2b3bc37ecd4