]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-journal-header' of git://github.com/XinzeChi/ceph
authorSage Weil <sage@redhat.com>
Fri, 1 May 2015 16:22:01 +0000 (09:22 -0700)
committerSage Weil <sage@redhat.com>
Fri, 1 May 2015 16:22:01 +0000 (09:22 -0700)
commit8d596bfa24c9c3e2aadbb87494284cb5fd824e55
tree5666ed8e420a1b3bcd927db046b7e2a1318f61ec
parentb5fa1607ee130739376f70ff3dab1d0ea792775e
parent8f80ae3fbaba7b0e64b6e4df6c2dddd10ac50e5a
Merge branch 'wip-journal-header' of git://github.com/XinzeChi/ceph

Conflicts:
src/gmock
src/os/FileJournal.cc
src/os/FileJournal.h