From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 19 Jul 2019 01:45:27 +0000 (-0700)
Subject: Merge PR #29067 into master
X-Git-Tag: v15.1.0~2169
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f21c7f0f589ab72a1446441b752ecd4df5f8101e;p=ceph.git

Merge PR #29067 into master

* refs/pull/29067/head:
	qa/tasks: add exception in do_thrash()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

f21c7f0f589ab72a1446441b752ecd4df5f8101e