From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Mar 2019 20:01:15 +0000 (-0500)
Subject: Merge PR #26856 into master
X-Git-Tag: v14.2.0~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc3bdad87597066a813a3734b2a79e803340be36;p=ceph.git

Merge PR #26856 into master

* refs/pull/26856/head:
	os/bluestore: make osd_memory_limit default to .8x the cgroup limit
	os/bluestore: observe osd_memory_target config options
	common/config: set osd_memory_target based on POD_MEMORY_REQUEST
	common/util: include group limit in daemon metadata
	common/util: get_cgroup_memory_limit() helper
	common/config: pass entity_type down into parse_env()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
---

fc3bdad87597066a813a3734b2a79e803340be36