From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Jun 2018 20:29:23 +0000 (-0500)
Subject: Merge PR #22583 into master
X-Git-Tag: v14.0.1~1097
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dce659ca2a987111cee71db98b62c6071f8b40fe;p=ceph.git

Merge PR #22583 into master

* refs/pull/22583/head:
	test/objectstore/CMakefiles: fix unittest_alloc_bench build

Reviewed-by: Mark Nelson <mnelson@redhat.com>
---

dce659ca2a987111cee71db98b62c6071f8b40fe