]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitad3c4b45a3fb0a588df6d1ef41b4b2b4c17d6b67
tree82ecc6fa3d45f38d4dcfd04d184ca5f392761bfe
parent3326f0bae5fab7d56f45306be53ba0c2967c1477
parente7ad0eeaaa3a73b5b78764d86eb634ca7072afd1
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>
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/osd_types.cc
src/osd/osd_types.h