]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
committerSage Weil <sage@newdream.net>
Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
commitaad9ffec26b6dadab721ca8acb444bac0aa4a81e
tree08911c101e823fa0bd7fc68adac7fe85100a567c
parent62e4cdea62791c8b03fd4c47cadfd59bcb867908
parentb40e7dc0f73bc24631e8cd79d68d790733aafb99
Merge branch 'testing' into unstable
src/mds/MDCache.cc
src/mds/MDS.cc
src/msg/SimpleMessenger.cc
src/os/JournalingObjectStore.cc