From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Mar 2019 14:11:47 +0000 (-0600)
Subject: Merge PR #26796 into master
X-Git-Tag: v14.1.1~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b88a10aef2894768bc383e67c39dbe504e5c10f0;p=ceph.git

Merge PR #26796 into master

* refs/pull/26796/head:
	common/options: osd_memory_target et al are TYPE_SIZE

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

b88a10aef2894768bc383e67c39dbe504e5c10f0