From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Mar 2019 22:15:33 +0000 (-0500)
Subject: Merge PR #26822 into master
X-Git-Tag: v15.0.0~221
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04dad6beaf3f8eefd5ece92cff3622282521fff3;p=ceph.git

Merge PR #26822 into master

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

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

04dad6beaf3f8eefd5ece92cff3622282521fff3