From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Feb 2020 18:55:53 +0000 (-0600)
Subject: Merge PR #33039 into master
X-Git-Tag: v15.1.1~536
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e640a95b89544b16d8ea2a325d250f218d41e45e;p=ceph.git

Merge PR #33039 into master

* 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>
---

e640a95b89544b16d8ea2a325d250f218d41e45e