]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #27473 into master
authorSage Weil <sage@redhat.com>
Fri, 12 Apr 2019 11:57:03 +0000 (06:57 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Apr 2019 11:57:03 +0000 (06:57 -0500)
commita2e71639da2ff9ab4ba3e2c010b4ea12488e1579
tree680aabf18016b8d686c5c7285810944438e4c354
parent75853f3e30ba07eecd8b3c98c1c54f27c3fbd36c
parent76503a1438fa1f166d2c230c73ca8d7b67e6468d
Merge PR #27473 into master

* refs/pull/27473/head:
mgr/DaemonServer: prevent pgp_num reductions from outpacing pg_num merges

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>