]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02aeeb0 8eebeed)
Merge PR #33139 into master
authorSage Weil <sage@redhat.com>
Tue, 11 Feb 2020 16:43:09 +0000 (10:43 -0600)
committerSage Weil <sage@redhat.com>
Tue, 11 Feb 2020 16:43:09 +0000 (10:43 -0600)
* refs/pull/33139/head:
mgr/cephadm: catch exception in _check_hosts()
mgr/cephadm: do not crash module on exception in serve thread

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

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