From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 23 Dec 2018 14:28:49 +0000 (+0800)
Subject: Merge pull request #25626 from xiexingguo/wip-no-upmap-for-merge
X-Git-Tag: v14.1.0~548
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d351e02880c92968e74b47b49ab3114319619a56;p=ceph.git

Merge pull request #25626 from xiexingguo/wip-no-upmap-for-merge

mgr/balancer: skip auto-balancing for pools with pending pg-merge

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

d351e02880c92968e74b47b49ab3114319619a56