From: Sage Weil <sage@redhat.com>
Date: Fri, 26 Apr 2019 18:23:36 +0000 (-0500)
Subject: Merge PR #27729 into master
X-Git-Tag: v15.1.0~2818
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d2520707e002d711caa632d4641ba53db009c305;p=ceph-ci.git

Merge PR #27729 into master

* refs/pull/27729/head:
	osd: take heartbeat_lock when calling heartbeat()

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

d2520707e002d711caa632d4641ba53db009c305