]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4fb688d) | patch
Backport the merge commit of branch 'wip-journal-header' of git://github.com/XinzeChi...
authorSage Weil <sage@redhat.com>
Fri, 1 May 2015 16:22:01 +0000 (09:22 -0700)
committerDavid Zafman <dzafman@redhat.com>
Thu, 25 Feb 2016 20:33:31 +0000 (12:33 -0800)
commit18c49b6474a563b5f7f7cef671050d46ac4c3c4f
tree0011620ead1c68fc139614efe1f083767fe90bb8tree | snapshot
parent4fb688d15c40a9b9d5a54700b3c7695a97ffd03bcommit | diff
Backport the merge commit of branch 'wip-journal-header' of git://github.com/XinzeChi/ceph

(cherry picked from commit 8d596bfa24c9c3e2aadbb87494284cb5fd824e55)

Conflicts:
src/os/FileJournal.cc (trivial)
src/os/FileJournal.h (trivial)

Renamed write_header() to write_header_sync() in a merge
Signed-off-by: David Zafman <dzafman@redhat.com>
src/os/FileJournal.cc diff | blob | history
src/os/FileJournal.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.