From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Mar 2019 16:21:23 +0000 (-0500)
Subject: Merge PR #27154 into master
X-Git-Tag: v15.0.0~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad3c4b45a3fb0a588df6d1ef41b4b2b4c17d6b67;p=ceph.git

Merge PR #27154 into master

* refs/pull/27154/head:
	mgr/pg_autoscaler: apply bias to pg_num selection
	mgr/pg_autoscaler: include pg_autoscale_bias in autoscale-status table
	osd/osd_types,mon: add pg_autoscale_bias pool property

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

ad3c4b45a3fb0a588df6d1ef41b4b2b4c17d6b67