]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2764 from ceph/wip-9851
authorSamuel Just <sam.just@inktank.com>
Thu, 6 Nov 2014 18:18:27 +0000 (10:18 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 6 Nov 2014 18:18:27 +0000 (10:18 -0800)
osd: bring FileJournal in sync with giant

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

Trivial merge