]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #39435 into master
authorSage Weil <sage@newdream.net>
Tue, 23 Mar 2021 01:57:45 +0000 (21:57 -0400)
committerSage Weil <sage@newdream.net>
Tue, 23 Mar 2021 01:57:45 +0000 (21:57 -0400)
commit94e152fb8dcd324d0c9cbe7d008da67475d8f007
tree7fce94cfe51fa4d55d05f43d6c860332633e81bd
parent5aab596d79f2a97c43d1eca77f00f36d04242d32
parent83f0ca9ea02d51d3311ae60d6805fea7c2546b3d
Merge PR #39435 into master

* refs/pull/39435/head:
mgr/cephadm: redeploy daemons deployed using old image during upgrade
mgr/cephadm: add container digests of mgr that deployed daemon to unit.meta

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/upgrade.py