From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 17 Oct 2018 17:18:50 +0000 (-0700)
Subject: Merge PR #24503 into master
X-Git-Tag: v14.1.0~1164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1dca00f90c98fd9eca993814977a1343e543764;p=ceph.git

Merge PR #24503 into master

* refs/pull/24503/head:
	qa: increase timeout for cleanup

Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

b1dca00f90c98fd9eca993814977a1343e543764