From: Sage Weil <sage@redhat.com>
Date: Mon, 13 Aug 2018 18:00:51 +0000 (-0500)
Subject: Merge PR #23406 into master
X-Git-Tag: v14.0.1~594
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a3d64ea9dbd3d6ec54d469e8cadb104af4c63f3b;p=ceph.git

Merge PR #23406 into master

* refs/pull/23406/head:
	TestOSDMap: Test with negative upmap values
	osd/OSDMap: Disallow negative values in _apply_upmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

a3d64ea9dbd3d6ec54d469e8cadb104af4c63f3b