]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33704 into master
authorSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 20:25:05 +0000 (14:25 -0600)
committerSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 20:25:05 +0000 (14:25 -0600)
commit54e4d2b6630014f15bbc36c9036aa5d6febf32a0
tree3357a6e51a2b67dd49a910d76ab658cf73378e82
parentc4d5c430c9e54f57eeff67ecbb9c4d37f4ea69eb
parent04d92eec5b0361803719231f00190415d76d6603
Merge PR #33704 into master

* refs/pull/33704/head:
mgr/cephadm: avoid racing updates to spec dict
mgr/cephadm: make _do_upgrade work synchronously
mgr/cephadm/tests/test_cephadm: remove broken rgw_update_fail test
mgr/cephadm: make _apply_service move services
mgr/cephadm: log when we create, destroy daemons
mgr/cephadm: drop async_map_completion decorators from create funcs
mgr/cephadm: _create_osd -> _create_osds
mgr/cephadm: _remove_daemon -> _remove_daemons

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>