]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #2456 from ceph/wip-9031-9262
authorSamuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:56:30 +0000 (14:56 -0800)
committerSamuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:56:30 +0000 (14:56 -0800)
commit0720e03ef3f0d26568ec1a052527318905affc99
tree90b16eec3f686a40ed72a0ba6d23d06e721b9af6
parentced51656daa1f9d3d32c489582f6cf3c97ef5aaa
parent9fbc083d6de0b24d872f5f18b7448fe89b2db976
Merge pull request #2456 from ceph/wip-9031-9262

Wip 9031 9262

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
src/librados/librados.cc
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h
src/osdc/Objecter.cc
src/osdc/Objecter.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/test/Makefile.am