]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/OSDMonitor.cc
src/osd/PGLog.cc

Simple merge
Simple merge