From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 31 Jul 2019 15:30:17 +0000 (-0700)
Subject: Merge pull request #29213 from smithfarm/wip-38962-luminous
X-Git-Tag: v12.2.13~165
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0caa8752459e7752e1e75063f4719149c85de069;p=ceph.git

Merge pull request #29213 from smithfarm/wip-38962-luminous

luminous: mgr: DaemonServer::handle_conf_change - broken locking

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

0caa8752459e7752e1e75063f4719149c85de069