From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Dec 2018 18:50:57 +0000 (-0800)
Subject: Merge PR #24748 into master
X-Git-Tag: v14.1.0~687
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4432aa5f26f371843ea6f622a89ae52e5a891e72;p=ceph.git

Merge PR #24748 into master

* refs/pull/24748/head:
	qa: use 6h timeout for pjd test

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

4432aa5f26f371843ea6f622a89ae52e5a891e72