]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
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)
* 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>

Trivial merge