From: Sage Weil <sage@newdream.net>
Date: Mon, 29 Mar 2021 16:20:39 +0000 (-0400)
Subject: Merge PR #40472 into master
X-Git-Tag: v17.1.0~2435
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f03376d7496a8204a4fd17c0832202409e8333c;p=ceph.git

Merge PR #40472 into master

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

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

4f03376d7496a8204a4fd17c0832202409e8333c