From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 10 Jan 2019 16:32:36 +0000 (-0800)
Subject: Merge pull request #25562 from smithfarm/wip-37629-luminous
X-Git-Tag: v12.2.11~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37047a2d9af94f69f819ba2dc462bbc45ce2535b;p=ceph.git

Merge pull request #25562 from smithfarm/wip-37629-luminous

luminous: mds: do not call Journaler::_trim twice

Reviewed-by:  Venky Shankar <vshankar@redhat.com>
---

37047a2d9af94f69f819ba2dc462bbc45ce2535b