From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Oct 2018 01:38:57 +0000 (-0500)
Subject: Merge PR #24804 into nautilus
X-Git-Tag: v14.0.1^0
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24814%2Fhead;p=ceph.git

Merge PR #24804 into nautilus

* refs/pull/24804/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
---

5f51cd286b747b1729006a5b98fb08b1b646237a