From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 28 May 2019 16:08:17 +0000 (-0700)
Subject: Merge pull request #28164 from pdvian/wip-39514-nautilus
X-Git-Tag: v14.2.2~164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=421e69bc6d83590b0bd087d4bcb6807bffb379d0;p=ceph.git

Merge pull request #28164 from pdvian/wip-39514-nautilus

nautilus: osd: take heartbeat_lock when calling heartbeat()

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
---

421e69bc6d83590b0bd087d4bcb6807bffb379d0