From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 22 Jan 2020 04:00:43 +0000 (-0800)
Subject: Merge PR #31232 into master
X-Git-Tag: v15.1.0~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6637200cacf5a38bb4514845dd127eae7e7f754b;p=ceph.git

Merge PR #31232 into master

* refs/pull/31232/head:
	test: test case for openfiletable MAX_ITEMS_PER_OBJ value verification
	mds/OpenFileTable: match MAX_ITEMS_PER_OBJ to osd_deep_scrub_large_omap_object_key_threshold

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

6637200cacf5a38bb4514845dd127eae7e7f754b