From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Apr 2019 21:49:17 +0000 (-0500)
Subject: Merge PR #27387 into nautilus
X-Git-Tag: v14.2.1~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=571be913c4599c8ac7b749448b113b978748c429;p=ceph.git

Merge PR #27387 into nautilus

* refs/pull/27387/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>
---

571be913c4599c8ac7b749448b113b978748c429