]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad8b42d a509b57)
Merge PR #25222 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 12 Dec 2018 20:48:01 +0000 (12:48 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 12 Dec 2018 20:48:01 +0000 (12:48 -0800)
* refs/pull/25222/head:
mds: do not call Journaler::_trim twice

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/PurgeQueue.cc patch | diff1 | diff2 | blob | history

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