From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 4 May 2018 02:05:50 +0000 (-0700)
Subject: Merge PR #21805 into master
X-Git-Tag: v14.0.0~220
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5eb2a2b10a839dcc72dbc16c6f66898fe5bede13;p=ceph.git

Merge PR #21805 into master

* refs/pull/21805/head:
	qa: move snap-hierarchy out of snaps workunits
	qa: try snap format upgrade with multimds cluster
	qa: add mds deactivation procedure for upgrades

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

5eb2a2b10a839dcc72dbc16c6f66898fe5bede13