]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24814 into master
authorSage Weil <sage@redhat.com>
Mon, 5 Nov 2018 21:51:14 +0000 (15:51 -0600)
committerSage Weil <sage@redhat.com>
Mon, 5 Nov 2018 21:51:14 +0000 (15:51 -0600)
* refs/pull/24814/head:
Merge PR #24804 into nautilus
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: Neha Ojha <nojha@redhat.com>

Trivial merge