From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Sep 2019 20:08:57 +0000 (-0500)
Subject: Merge PR #30139 into master
X-Git-Tag: v15.1.0~1645
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d94dc7f0f12e39f5de51f5b9d2f91145402498c;p=ceph.git

Merge PR #30139 into master

* refs/pull/30139/head:
	mgr/DaemonServer: skip adjusting pgp_num when merging is in-progress

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

8d94dc7f0f12e39f5de51f5b9d2f91145402498c