From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 12 Jan 2018 22:37:25 +0000 (-0800)
Subject: Merge PR #19885 into master
X-Git-Tag: v13.0.2~536
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e592c0210f422f90de9bfa234744cd63130d58c1;p=ceph.git

Merge PR #19885 into master

* refs/pull/19885/head:
	qa: increase osd count for ec testing
	qa: add missing openstack configs

Reviewed-by: Sage Weil <sage@redhat.com>
---

e592c0210f422f90de9bfa234744cd63130d58c1