]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e56c383 ca5c987)
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)
* 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>
1  2 
src/common/options.cc patch | diff1 | diff2 | blob | history
src/mds/MDCache.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/options.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.