From: Sage Weil <sage@redhat.com>
Date: Sun, 28 Oct 2018 14:39:50 +0000 (-0500)
Subject: Merge PR #24780 into master
X-Git-Tag: v14.1.0~1064
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b21f436c2d3faaf89a2693f7dcb0daffcf92ebec;p=ceph.git

Merge PR #24780 into master

* refs/pull/24780/head:
	osd: take heartbeat_lock before checking for session
	Merge PR #24725 into nautilus
	qa/tasks/qemu: use unique clone directory to avoid race with workunit
	mds: add missing mds_lock

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
---

b21f436c2d3faaf89a2693f7dcb0daffcf92ebec