]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40473 into pacific
authorSage Weil <sage@newdream.net>
Tue, 30 Mar 2021 00:25:54 +0000 (19:25 -0500)
committerSage Weil <sage@newdream.net>
Tue, 30 Mar 2021 00:25:54 +0000 (19:25 -0500)
commiteb5d7a868c962c30a549602c24db476707fdde6e
treea457c26eaa3f6c551c40ecb620a6b1cdc06aa04e
parent7e7e1f4ed3cc94c90a0e806a8c52e1798323bcc0
parent647cb478a4f4eb1af266f0e288bca0875f2ab1bd
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>