From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Apr 2019 11:57:03 +0000 (-0500)
Subject: Merge PR #27473 into master
X-Git-Tag: v15.1.0~2950
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2e71639da2ff9ab4ba3e2c010b4ea12488e1579;p=ceph.git

Merge PR #27473 into master

* refs/pull/27473/head:
	mgr/DaemonServer: prevent pgp_num reductions from outpacing pg_num merges

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

a2e71639da2ff9ab4ba3e2c010b4ea12488e1579