]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit5229e1ec7fd07cdbdf2fe774f3da52cbda4eac4a
tree4243f645598d4c164d4cda8a2600da23d060edf2
parent4982bd58fc2a3bafd3e3664f19e0f7aad3cea2e7
parentd2c591a142479cf5dd58da599da8d7212f5c5701
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>