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

Merge PR #24010 into master

* refs/pull/24010/head:
	osd/OSD: kick right merge source
	mgr/DaemonServer: split should respect inflight creating pgs

Reviewed-by: Sage Weil <sage@redhat.com>
---

ecc9564fbb5599ea8e9c5526e6fc44c259069960