git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

author	Sebastian Wagner <sewagner@redhat.com>
	Wed, 1 Dec 2021 17:04:44 +0000 (18:04 +0100)
committer	GitHub <noreply@github.com>
	Wed, 1 Dec 2021 17:04:44 +0000 (18:04 +0100)
commit	4898706a716ba40dd427ff3fe5bb0d077c0a87d5
tree	a07d2cffea44e5f67d0b0f184e11436bd62069cd	tree \| snapshot
parent	3b565a5cbd0dcdb25e8d21f65b35be0c6d130a7f	commit \| diff
parent	018807ef655068d699c70388e41284addee32040	commit \| diff

Merge pull request #43149 from sebastian-philipp/cephadm-force-last-admin

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

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@newdream.net>

src/pybind/mgr/cephadm/inventory.py	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/serve.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

src/pybind/mgr/cephadm/inventory.py	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/serve.py	diff1 \|	diff2 \|	blob \| history