]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit567f83c2cc4c7c47218bfa867600debfbd4f5d97
treecbd43e0c24e3b3ca53e4d97a82d00c6d17a3c80a
parentad8b42d35640361fa4a37a3e496c001e9e71936c
parenta509b5719bc44a63d7664a1b019adca6a3993f19
Merge PR #25222 into master

* 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>
src/mds/PurgeQueue.cc