]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #631 from ceph/wip-5857-8
authorathanatos <rexludorum@gmail.com>
Thu, 26 Sep 2013 19:01:19 +0000 (12:01 -0700)
committerathanatos <rexludorum@gmail.com>
Thu, 26 Sep 2013 19:01:19 +0000 (12:01 -0700)
commit97c56ef3ec3f3641cc6ee536842e21c1a70d1dfe
tree3bb43147b301812dab522198bfe12fada1a19355
parent62626b49c4286355fab038d6aab80f2ef7675d69
parenta1f6b14e7fcd680f74a33e92845e54cbde69a5a3
Merge pull request #631 from ceph/wip-5857-8

Wip 5857 8

Reviewed-by: Sage Weil <sage@inktank.com>
src/common/hobject.h
src/os/FileStore.cc
src/os/FileStore.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/ReplicatedPG.cc
src/osd/osd_types.h