]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40472 into master
authorSage Weil <sage@newdream.net>
Mon, 29 Mar 2021 16:20:39 +0000 (12:20 -0400)
committerSage Weil <sage@newdream.net>
Mon, 29 Mar 2021 16:20:39 +0000 (12:20 -0400)
commit4f03376d7496a8204a4fd17c0832202409e8333c
tree67eabd45804f5bc87428f813138e5818f72763ac
parentc707d451fbb5528c2384c9fbc4356b7b112366e2
parentbb00de5c40bf70e2b9cd14c3890d0be05d7d984b
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>