]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit1cb0da00051c5b46245d5cc2357077c0b20dca4f
tree239e8d75ec2deecd477733a7270e7d5525e161ee
parent0eda6ca83d513a06c71e42d788284c068511963d
parent448dcc0a875f72835bfaa603abab23a02df3a879
Merge PR #33496 into master

* 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>
src/pybind/mgr/cephadm/module.py