]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' into rados
authorSage Weil <sage@newdream.net>
Wed, 16 Jan 2008 18:38:02 +0000 (10:38 -0800)
committerSage Weil <sage@newdream.net>
Wed, 16 Jan 2008 18:38:02 +0000 (10:38 -0800)
commit131894fbd0411eb1b57bba1d9f5bf945993802c7
tree6693858ba53309957fd59c77097b88be9c89be4d
parentcd13061618014564deef6dd91480f8713b455f60
parenta10cb3ac21520b7e0f8a5f8ced61dc46b742ac95
Merge branch 'master' into rados

Conflicts:

src/TODO
src/TODO
src/client/Client.cc