]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31232 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 22 Jan 2020 04:00:43 +0000 (20:00 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 22 Jan 2020 04:00:43 +0000 (20:00 -0800)
* 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>

Trivial merge