From: Sage Weil <sage@redhat.com>
Date: Thu, 15 Aug 2019 19:02:34 +0000 (-0500)
Subject: Merge PR #29581 into master
X-Git-Tag: v15.1.0~1873
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=81f5b3788d513c44c868fb07f1f7ee6a0348a21b;p=ceph-ci.git

Merge PR #29581 into master

* refs/pull/29581/head:
	os/bluestore: do not set osd_memory_target default from cgroup limit

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

81f5b3788d513c44c868fb07f1f7ee6a0348a21b