]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Thu, 12 Aug 2010 18:57:43 +0000 (11:57 -0700)
committerSage Weil <sage@newdream.net>
Thu, 12 Aug 2010 18:57:43 +0000 (11:57 -0700)
1  2 
src/msg/SimpleMessenger.cc
src/osd/ReplicatedPG.cc

Simple merge
Simple merge