From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 3 Jul 2018 16:10:09 +0000 (-0700)
Subject: Merge PR #22165 into master
X-Git-Tag: v14.0.1~958
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=628927d5ba91acbf64f4c12ec3213760f13e9f5c;p=ceph.git

Merge PR #22165 into master

* refs/pull/22165/head:
	qa: add one-off clusters to qa/cephfs/clusters
	qa: allocate more space for VM disk
	qa/cephfs/clusters/*: bigger cinder volumses

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

628927d5ba91acbf64f4c12ec3213760f13e9f5c