From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Oct 2018 13:36:34 +0000 (-0500)
Subject: Merge PR #24787 into master
X-Git-Tag: v14.1.0~1059
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c40685ebdd18b12ecd885e27319d8663380e430e;p=ceph.git

Merge PR #24787 into master

* refs/pull/24787/head:
	Merge PR #24796 into nautilus
	osd: fix heartbeat_reset unlock
	Merge PR #24780 into nautilus
	Merge PR #24761 into nautilus
	Merge PR #24651 into nautilus
	osd: fix race between op_wq and context_queue
	test: Make sure kill_daemons failure will be easy to find
	test: Add flush_pg_stats to make test more deterministic
---

c40685ebdd18b12ecd885e27319d8663380e430e