]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #44625 from sebastian-philipp/pacific-backport-43149
authorSebastian Wagner <sewagner@redhat.com>
Wed, 19 Jan 2022 10:39:13 +0000 (11:39 +0100)
committerGitHub <noreply@github.com>
Wed, 19 Jan 2022 10:39:13 +0000 (11:39 +0100)
commit26e4752bde1ef181717c2ebc441fa6b4eeaf9772
tree4eb434d4cf101f1ae055fc678c460678228ed614
parent37c6bbfffc2c6c4658da49d158819e4c7cb29f89
parent56d53aaaf621f3f1f05b64a007456be0d8d4cbc9
Merge pull request #44625 from sebastian-philipp/pacific-backport-43149

pacific: mgr/cephadm: Add client.admin keyring when upgrading from older version

Reviewed-by: Michael Fritch <mfritch@suse.com>
src/pybind/mgr/cephadm/module.py