From: Sage Weil <sage@newdream.net>
Date: Fri, 12 Mar 2021 16:18:48 +0000 (-0500)
Subject: Merge PR #40046 into master
X-Git-Tag: v17.1.0~2634
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b117af263a081dda0a88005d39603b917b1da11;p=ceph.git

Merge PR #40046 into master

* refs/pull/40046/head:
	qa/suites/rados/cephadm/upgrade: deploy a legacy r.z-style rgw

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

5b117af263a081dda0a88005d39603b917b1da11