From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Sep 2018 04:14:15 +0000 (-0500)
Subject: Merge PR #24226 into master
X-Git-Tag: v14.0.1~190
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a29103e894abf19a23eff055d1c1be6c746aaa23;p=ceph.git

Merge PR #24226 into master

* refs/pull/24226/head:
	osd/PG: fix not_ready_to_merge behavior for merge target

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

a29103e894abf19a23eff055d1c1be6c746aaa23