]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27928 into master
authorSage Weil <sage@redhat.com>
Fri, 10 May 2019 21:22:40 +0000 (16:22 -0500)
committerSage Weil <sage@redhat.com>
Fri, 10 May 2019 21:22:40 +0000 (16:22 -0500)
* 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>

Trivial merge