]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Mon, 2 Aug 2010 20:26:23 +0000 (13:26 -0700)
committerSage Weil <sage@newdream.net>
Mon, 2 Aug 2010 20:26:23 +0000 (13:26 -0700)
commit3fc47c2e351731422fd349d4212e84f381f48785
tree6ae50ab9ad5b5f5c872003bf894ef84dbd3ff30b
parent025bce64f42d22e971aa305e1981b14350d600d4
parent9ccf9cb6c5ebf6c51985c629be65a61422bebd51
Merge branch 'testing' into unstable
src/osd/OSD.cc