]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33496 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:40:19 +0000 (14:40 -0600)
committerSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:40:19 +0000 (14:40 -0600)
* refs/pull/33496/head:
mgr/cephadm: combine get_daemons_by_daemon -> get_daemons_by_service
mgr/cephadm: remove apply_mon support
mgr/cephadm: use generics for add_mon
mgr/cephadm: use _apply_service for mgrs
mgr/cephadm: refactor most daemon add methods
mgr/cephadm: refactor _update_service and all apply methods
mgr/cephadm: fix get_unique_name when name in use

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge