]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #5442 from ceph/wip-12551
authorSage Weil <sage@redhat.com>
Wed, 9 Sep 2015 20:21:07 +0000 (16:21 -0400)
committerSage Weil <sage@redhat.com>
Wed, 9 Sep 2015 20:21:07 +0000 (16:21 -0400)
commitf74c60f429f26c1cd55e219642fa19cb5a803468
tree19d89eab667074402e1bc2703548b9acc09f4c12
parent6c7265a67c98c1f995c8ea86afffadf1017d21a3
parent6f9ee7961eee9ee3a61a07cbe0d8d289ee98fa9a
Merge pull request #5442 from ceph/wip-12551

ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Reviewed-by: Sage Weil <sage@redhat.com>
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.cc
src/osd/osd_types.h
src/osdc/Objecter.h