]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b7826d d08c1ff)
Merge PR #33039 into master
authorSage Weil <sage@redhat.com>
Wed, 5 Feb 2020 18:55:53 +0000 (12:55 -0600)
committerSage Weil <sage@redhat.com>
Wed, 5 Feb 2020 18:55:53 +0000 (12:55 -0600)
* refs/pull/33039/head:
osd/OSD: prevent down osds from immediately rejoining the culster
osd/OSD: trim osd_markdown_log in tick() thread

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>

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