]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 234b4eb 6232b9e)
Merge PR #33602 into master
authorSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 03:18:26 +0000 (21:18 -0600)
committerSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 03:18:26 +0000 (21:18 -0600)
* refs/pull/33602/head:
mgr/cephadm/osd: call synchronous _remove_daemon()
mgr/cephadm/osd: Add pytest for osd removal
mgr/cephadm/osd: delete transitional attributes
mgr/cephadm: Move remove osd code to osd.py

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>

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