From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Oct 2018 02:25:55 +0000 (-0500)
Subject: Merge PR #24796 into nautilus
X-Git-Tag: v14.0.1~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24787%2Fhead;p=ceph.git

Merge PR #24796 into nautilus

* refs/pull/24796/head:
	osd: fix heartbeat_reset unlock

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

bc7cfe0885d905c6fd4a7fad8640c93f4e929afa