]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #27154 into master
authorSage Weil <sage@redhat.com>
Thu, 28 Mar 2019 16:21:23 +0000 (11:21 -0500)
committerSage Weil <sage@redhat.com>
Thu, 28 Mar 2019 16:21:23 +0000 (11:21 -0500)
* 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>
1  2 
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/osd_types.cc
src/osd/osd_types.h

Simple merge
Simple merge
Simple merge
Simple merge