]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'gh/master' into wip-op-data-mux
authorSage Weil <sage.weil@dreamhost.com>
Wed, 18 Jan 2012 01:33:57 +0000 (17:33 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 18 Jan 2012 01:33:57 +0000 (17:33 -0800)
commit2bffed3bc94ff4aa8ade6f3a504d418b3a2a2fa3
treee1c77dde413b1ad8b5b10c934b1816df6e6398fa
parent905e8d80debf3fc66e70ab1efcfdc11e060ee0a5
parent1a7c8b49f099268ee468877f7f1f7ad747995547
Merge remote branch 'gh/master' into wip-op-data-mux
src/ceph_mds.cc
src/include/ceph_fs.h
src/msg/SimpleMessenger.h
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.cc
src/osd/osd_types.h
src/rgw/rgw_rados.cc