From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 31 Oct 2019 20:08:34 +0000 (-0700)
Subject: Merge PR #31206 into master
X-Git-Tag: v15.1.0~1097
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ced05b9eb3d630c72e9f551005d1d1a428d8b8d8;p=ceph.git

Merge PR #31206 into master

* refs/pull/31206/head:
	qa: test fs:upgrade when running upgrade suite

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

ced05b9eb3d630c72e9f551005d1d1a428d8b8d8