From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Jan 2019 04:30:40 +0000 (-0600)
Subject: Merge PR #25652 into master
X-Git-Tag: v14.1.0~533
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49eab70fbcfeaca5420d79891f570fa7e55f0827;p=ceph.git

Merge PR #25652 into master

* refs/pull/25652/head:
	osd/OSDMap: disallow new upmaps on pgs that are pending merge
	osd/PG: align past_intervals and last_epoch_clean for fabricated merge target

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

49eab70fbcfeaca5420d79891f570fa7e55f0827