]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #4473 from ceph/wip-10809-11135-10290
authorDavid Zafman <dzafman@redhat.com>
Wed, 13 May 2015 20:10:39 +0000 (13:10 -0700)
committerDavid Zafman <dzafman@redhat.com>
Wed, 13 May 2015 20:10:39 +0000 (13:10 -0700)
commit00c4fc890737b0c57224d223d002d02e94ef097b
tree75ccee8c8c7156a20de097e837873de51a0727ec
parentb98a921fc920e4cc38ffae9ef23a83dfd36c1dd5
parent9016269a1c248da69a0e85df4ca3ba95011710c5
Merge pull request #4473 from ceph/wip-10809-11135-10290

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
src/os/FileJournal.cc
src/osd/OSD.cc
src/osd/PGLog.cc
src/osd/ReplicatedPG.cc