From: Sage Weil <sage@redhat.com>
Date: Sun, 27 Oct 2019 14:20:51 +0000 (-0500)
Subject: Merge PR #31131 into master
X-Git-Tag: v15.1.0~1149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44d45ff693074b97d70e5121cc028731ae36f5ed;p=ceph.git

Merge PR #31131 into master

* refs/pull/31131/head:
	crush: remove invalid upmap items

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

44d45ff693074b97d70e5121cc028731ae36f5ed