]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit01d31d471d7934872416e5e8f3cf26c529bb5835
treea5d25100bf7352c40183523270d9fa90ef11a215
parentb3fc22ebe3d2d030b6fee4d9a914a3ec1b0f9878
parent5f51cd286b747b1729006a5b98fb08b1b646237a
Merge PR #24814 into master

* 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>