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

Merge PR #27506 into master

* refs/pull/27506/head:
	src/tests/crushtool: Add test for an empty default
	crush/CrushCompiler: Fix __replacement_assert

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

deae32d8808d913fb4a614d55a0d46ee315054a7