]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #16036 into HEAD
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Sep 2017 00:00:39 +0000 (17:00 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Sep 2017 00:00:39 +0000 (17:00 -0700)
* refs/remotes/upstream/pull/16036/head:
mds: improve cap min/max ratio descriptions
mds: fix whitespace
mds: cap client recall to min caps per client
mds: fix conf types
mds: fix whitespace
doc/cephfs: add client min cache and max cache ratio describe
mds: adding tunable features for caps_per_client

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/common/options.cc
src/mds/Server.cc

Simple merge
Simple merge