]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #37618 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 7 Nov 2020 04:51:06 +0000 (20:51 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 7 Nov 2020 04:51:06 +0000 (20:51 -0800)
* refs/pull/37618/head:
mds: throttle cap acquisition via readdir

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
qa/tasks/cephfs/cephfs_test_case.py
qa/tasks/cephfs/test_client_limits.py
src/common/options.cc

Simple merge
Simple merge
Simple merge