]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 326d00a 7a2e428)
Merge PR #21166 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Apr 2018 04:28:14 +0000 (21:28 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Apr 2018 04:28:14 +0000 (21:28 -0700)
* refs/pull/21166/head:
mds: fix occasional dir rstat inconsistency between multi-MDSes

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/client/Client.h patch | diff1 | diff2 | blob | history
src/include/ceph_fs.h patch | diff1 | diff2 | blob | history
src/mds/Server.cc patch | diff1 | diff2 | blob | history

diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/include/ceph_fs.h
Simple merge
diff --cc src/mds/Server.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.