From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Feb 2021 19:20:13 +0000 (-0500)
Subject: Merge PR #39213 into master
X-Git-Tag: v17.1.0~3052
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fdf65a4f43dfced28245620206d84db2e8269584;p=ceph.git

Merge PR #39213 into master

* refs/pull/39213/head:
	qa/suites/upgrade/octopus-x/parallel: include cephfs in upgrade cluster

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

fdf65a4f43dfced28245620206d84db2e8269584