]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Thu, 19 Aug 2010 17:47:19 +0000 (10:47 -0700)
committerSage Weil <sage@newdream.net>
Thu, 19 Aug 2010 17:47:19 +0000 (10:47 -0700)
1  2 
src/client/Client.cc
src/osd/ReplicatedPG.cc

Simple merge
Simple merge