From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Feb 2019 15:39:59 +0000 (-0600)
Subject: Merge PR #26187 into master
X-Git-Tag: v14.1.0~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4de85a5321b77f7024f08f12d4b0f55bf1053d5d;p=ceph.git

Merge PR #26187 into master

* refs/pull/26187/head:
	mgr/balancer: balance pools with same crush_rule in batch
	osd/OSDMap: more improvements to upmap

Reviewed-by: Sage Weil <sage@redhat.com>
---

4de85a5321b77f7024f08f12d4b0f55bf1053d5d