]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* refs/pull/40473/head:
mgr/cephadm/upgrade: ignore deployed_by until mgr is upgraded

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

Trivial merge