]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24666 into master
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 01:08:32 +0000 (20:08 -0500)
committerSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 01:08:32 +0000 (20:08 -0500)
* refs/pull/24666/head:
include/types: fixed compile warning for signed/unsigned comparison
osd/PrimaryLogPG: uncommitted dup ops should respond with logged return code
osd/PrimaryLogPG: propagate error return codes on object copy_get ops
osd/PGLog: optionally record error return codes for extra_reqids
osd/osd_types: include PG log return codes in object copy data

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h
src/test/librados/tier.cc

diff --cc src/osd/PG.h
Simple merge
Simple merge
Simple merge
Simple merge