From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 8 May 2019 21:48:03 +0000 (-0700)
Subject: Merge PR #27761 into master
X-Git-Tag: v15.1.0~2721
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e49c15d69f72572d4cf24a2fc5fc0ca364a2fb7;p=ceph.git

Merge PR #27761 into master

* refs/pull/27761/head:
	qa: use skipTest method instead of exception

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

5e49c15d69f72572d4cf24a2fc5fc0ca364a2fb7