From: Sage Weil <sage@newdream.net>
Date: Mon, 22 Mar 2021 17:26:06 +0000 (-0400)
Subject: Merge PR #40290 into master
X-Git-Tag: v17.1.0~2519
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ccbf40317fc78d04a521ac83397bfd139d2bf9d8;p=ceph-ci.git

Merge PR #40290 into master

* refs/pull/40290/head:
	qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh

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

ccbf40317fc78d04a521ac83397bfd139d2bf9d8