From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Nov 2018 21:51:14 +0000 (-0600)
Subject: Merge PR #24814 into master
X-Git-Tag: 3.2-0~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=01d31d471d7934872416e5e8f3cf26c529bb5835;p=ceph-ci.git

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

01d31d471d7934872416e5e8f3cf26c529bb5835