From: Sage Weil <sage@newdream.net>
Date: Tue, 30 Mar 2021 00:25:54 +0000 (-0500)
Subject: Merge PR #40473 into pacific
X-Git-Tag: v16.2.0~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb5d7a868c962c30a549602c24db476707fdde6e;p=ceph.git

Merge PR #40473 into pacific

* refs/pull/40473/head:
	mgr/cephadm/upgrade: ignore deployed_by until mgr is upgraded

Reviewed-by: Adam King <adking@redhat.com>
---

eb5d7a868c962c30a549602c24db476707fdde6e