From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Feb 2020 14:08:01 +0000 (-0600)
Subject: Merge PR #33037 into master
X-Git-Tag: v15.1.1~503
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=593420d0c72aad4c48cb5638eec9268f685a8ca7;p=ceph.git

Merge PR #33037 into master

* refs/pull/33037/head:
	osd/OSD: choose more heartbeat peers from different subtrees

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
---

593420d0c72aad4c48cb5638eec9268f685a8ca7