]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91eb165 9b6ae80)
Merge PR #40459 into master
authorSage Weil <sage@newdream.net>
Mon, 5 Apr 2021 18:14:22 +0000 (14:14 -0400)
committerSage Weil <sage@newdream.net>
Mon, 5 Apr 2021 18:14:22 +0000 (14:14 -0400)
* refs/pull/40459/head:
mgr/cephadm: don't cleanup the daemon keyring on failed redeploy

Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/pybind/mgr/cephadm/serve.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.