From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Mar 2019 21:45:53 +0000 (-0500)
Subject: Merge PR #26822 into nautilus
X-Git-Tag: v14.2.0~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9df050f5d653261328aacc738ac43e78edce55c5;p=ceph.git

Merge PR #26822 into nautilus

* refs/pull/26822/head:
	osd/PG: adjust pg history on fabricated merge target if necessary

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

9df050f5d653261328aacc738ac43e78edce55c5