]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-da-SCA-20141025'
authorSage Weil <sage@redhat.com>
Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
committerSage Weil <sage@redhat.com>
Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
commit64d3b14f7c13d2ff561667cb064026014fb3160b
tree9dae5f69d258bf4417e0603fc791fa5006dab07b
parent1cf9600b0d0ea5bcf48bfaa566ce048278c4798c
parent09edada98c4427c24ff0c68dcd21d02669e0809b
Merge branch 'wip-da-SCA-20141025'

Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc
src/osd/PGLog.cc