]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit3f9bf738daf47ff4ff56c9f76d1487a5afc5e30a
tree3a472d1ca1a47dad4412b2a73cbb2580d9869c8b
parenta340e6d0b166019f58dca0703faf30dd3178c14f
parent3e17a0872a3864cb6aee46959afd955ef0cbafeb
Merge pull request #2764 from ceph/wip-9851

osd: bring FileJournal in sync with giant

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