From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Feb 2019 13:02:44 +0000 (-0600)
Subject: Merge PR #26492 into master
X-Git-Tag: v14.1.0~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75cf9e6f26ca55302c137b2a8bebb85a39e67236;p=ceph.git

Merge PR #26492 into master

* refs/pull/26492/head:
	osd: fix pg split/merge prime during startup

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

75cf9e6f26ca55302c137b2a8bebb85a39e67236