From: Sage Weil <sage@redhat.com>
Date: Fri, 10 May 2019 21:22:40 +0000 (-0500)
Subject: Merge PR #27928 into master
X-Git-Tag: v15.1.0~2695
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5229e1ec7fd07cdbdf2fe774f3da52cbda4eac4a;p=ceph.git

Merge PR #27928 into master

* refs/pull/27928/head:
	mon/OSDMonitor: require nautilus to set pg_autoscale_mode
	mon/OSDMonitor: allow pg_num to increase when require_osd_release < N

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

5229e1ec7fd07cdbdf2fe774f3da52cbda4eac4a