From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Mar 2021 18:07:51 +0000 (-0400)
Subject: Merge PR #40075 into master
X-Git-Tag: v17.1.0~2600
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=798ddca3d09e007fc8a739bd05c89ec71794829d;p=ceph.git

Merge PR #40075 into master

* refs/pull/40075/head:
	qa/suites/rados/cephadm/upgrade: add centos upgrade on latest octopus

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

798ddca3d09e007fc8a739bd05c89ec71794829d