From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Jul 2017 05:33:34 +0000 (-0700)
Subject: Merge PR 16200 into master
X-Git-Tag: ses5-milestone9~1^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b1a229fca30c84ae9cb86a6a855334da9fe2120;p=ceph.git

Merge PR 16200 into master

* refs/remotes/upstream/pull/16200/head:
	qa: thrash max_mds and deactivate ranks

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

5b1a229fca30c84ae9cb86a6a855334da9fe2120