From: Samuel Just <sam.just@inktank.com>
Date: Thu, 6 Nov 2014 18:18:27 +0000 (-0800)
Subject: Merge pull request #2764 from ceph/wip-9851
X-Git-Tag: v0.80.8~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f9bf738daf47ff4ff56c9f76d1487a5afc5e30a;p=ceph.git

Merge pull request #2764 from ceph/wip-9851

osd: bring FileJournal in sync with giant

Reviewed-by: Samuel Just <sjust@redhat.com>
---

3f9bf738daf47ff4ff56c9f76d1487a5afc5e30a