From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Apr 2019 13:28:21 +0000 (-0500)
Subject: Merge PR #27875 into master
X-Git-Tag: v15.1.0~2784
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4933a0475b32f56fe2983a6d618da2709df2b46b;p=ceph.git

Merge PR #27875 into master

* refs/pull/27875/head:
	mgr/DaemonServer: Fix pgp_num throttling min
	mgr/DaemonServer: allow pgp_num increases to be fast if pool is empty(ish)
	mgr: fix pgp_num vs merge pacer

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

4933a0475b32f56fe2983a6d618da2709df2b46b