From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 11 Apr 2019 18:52:18 +0000 (-0700)
Subject: Merge pull request #27454 from pdvian/wip-38964-nautilus
X-Git-Tag: v14.2.1~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa48e1ed5250599e766043ccee26c8b1894298b4;p=ceph.git

Merge pull request #27454 from pdvian/wip-38964-nautilus

nautilus: mgr/DaemonServer: handle_conf_change - fix broken locking

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

aa48e1ed5250599e766043ccee26c8b1894298b4