]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #27875 into master
authorSage Weil <sage@redhat.com>
Tue, 30 Apr 2019 13:28:21 +0000 (08:28 -0500)
committerSage Weil <sage@redhat.com>
Tue, 30 Apr 2019 13:28:21 +0000 (08:28 -0500)
* refs/pull/27875/head:
mgr/DaemonServer: Fix pgp_num throttling min
mgr/DaemonServer: allow pgp_num increases to be fast if pool is empty(ish)
mgr: fix pgp_num vs merge pacer

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge