]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Sun, 2 Dec 2012 02:23:02 +0000 (18:23 -0800)
committerSage Weil <sage@inktank.com>
Sun, 2 Dec 2012 02:23:02 +0000 (18:23 -0800)
1  2 
src/ceph_osd.cc
src/osd/ReplicatedPG.cc

diff --cc src/ceph_osd.cc
Simple merge
Simple merge