From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Mar 2020 20:27:58 +0000 (-0600)
Subject: Merge PR #33601 into master
X-Git-Tag: v15.1.1~164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=367c402dcc609e5dee6240b1abd95e9ada11ba76;p=ceph.git

Merge PR #33601 into master

* refs/pull/33601/head:
	qa/tasks/thrashosds-health: disable osd_max_markdown behavior
	osd: derr on do_shutdown cases

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

367c402dcc609e5dee6240b1abd95e9ada11ba76