]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23482 from Yan-waller/wip-walle-180808-mgr-deadlock
authoryanjun <942431195@qq.com>
Fri, 10 Aug 2018 02:49:19 +0000 (10:49 +0800)
committerGitHub <noreply@github.com>
Fri, 10 Aug 2018 02:49:19 +0000 (10:49 +0800)
mgr: fix beacon interruption caused by deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Trivial merge