From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Jun 2018 18:00:25 +0000 (-0500)
Subject: Merge PR #22630 into master
X-Git-Tag: v14.0.1~1044
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ca6fad0990b2066ab2af7bd0cee64e80db19f1f;p=ceph.git

Merge PR #22630 into master

* refs/pull/22630/head:
	osd/OSDMap.cc: move sanity checks to the proper place
	osd/OSDMap.cc: remove pg_upmap/pg_upmap_items too if osd is gone

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

8ca6fad0990b2066ab2af7bd0cee64e80db19f1f