]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
committerSage Weil <sage@newdream.net>
Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
commit930ef4e563dfbbfd1192d6b0676d808d8f54ddb0
tree0cfa4f2f149ff7c7284f62fd6ba247fe3e3fa4b9
parentccdfcd3947bd26dcd3d5b5571f9deae8d11bbade
parent22a7d42b58231e5e7ae0838c9ca55ea2e9dd9441
Merge branch 'testing' into unstable
src/mds/CInode.cc
src/osd/OSD.cc