From: Sage Weil <sage@redhat.com>
Date: Sat, 20 Jul 2019 20:20:31 +0000 (-0500)
Subject: Merge PR #29072 into master
X-Git-Tag: v15.1.0~2151
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc32b1ac0ef8e20c0dc3139e132a0b42399ca8e5;p=ceph.git

Merge PR #29072 into master

* refs/pull/29072/head:
	qa/suites/upgrade: set pg_autoscale_mode=off on existing pools
	mon/MgrMonitor: make pg_autoscaler always on
	qa/tasks/ceph.conf.template: osd_pool_default_pg_autoscale_mode = off

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

dc32b1ac0ef8e20c0dc3139e132a0b42399ca8e5