]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitfcea7d96e090f043ceef4d0c90d254c367ac05b5
tree62a46760cdcf28e115e7deb9cc03623ffe1dc77e
parente3654dfc96e3314e37f7bfd098a84b23f1abb9c8
parentd0f6991eb6ac32da09b40e652b666c0aaded60ff
Merge branch 'testing' into unstable
src/client/Client.cc
src/osd/ReplicatedPG.cc