]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Wed, 4 Aug 2010 17:37:09 +0000 (10:37 -0700)
committerSage Weil <sage@newdream.net>
Wed, 4 Aug 2010 17:37:09 +0000 (10:37 -0700)
1  2 
src/osd/OSD.cc
src/osd/ReplicatedPG.cc

diff --cc src/osd/OSD.cc
Simple merge
Simple merge