From: Sage Weil <sage@newdream.net>
Date: Mon, 22 Mar 2021 17:25:29 +0000 (-0400)
Subject: Merge PR #40288 into master
X-Git-Tag: v17.1.0~2520
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3612fc2e561ef1055f75afe7d4688c0754ddb91e;p=ceph-ci.git

Merge PR #40288 into master

* refs/pull/40288/head:
	mon/PGMap: change hard coded 0x10000 to macro CEPH_OSD_IN

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

3612fc2e561ef1055f75afe7d4688c0754ddb91e