From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Feb 2019 03:36:31 +0000 (-0600)
Subject: Merge PR #26513 into master
X-Git-Tag: v14.1.0~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95dbff79fd007b7625eaf6ec3240af93dd2430d4;p=ceph.git

Merge PR #26513 into master

* refs/pull/26513/head:
	osd/PG: fix comments in merge_from
	osd/PG: align past_intervals and last_epoch_clean for fabricated merge target

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

95dbff79fd007b7625eaf6ec3240af93dd2430d4