]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #18697 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 22 Nov 2017 21:40:21 +0000 (13:40 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 22 Nov 2017 21:40:21 +0000 (13:40 -0800)
commit23a86a404a0a70ebc1fcb92b5ff9e36a82730c6d
treeafdf55e95be6861172ea1ca7622073766630b6dc
parente56c38371767c2c9467f431e66f2ea2161d67605
parentca5c987860821a7784db1c6a74d1c661cdf427cc
Merge PR #18697 into master

* refs/pull/18697/head:
mds: limit size of MExportDir message
mds: optimize MDCache::try_subtree_merge
mds: optimize import/export state access

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/common/options.cc
src/mds/MDCache.cc