]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29581 into master
authorSage Weil <sage@redhat.com>
Thu, 15 Aug 2019 19:02:34 +0000 (14:02 -0500)
committerSage Weil <sage@redhat.com>
Thu, 15 Aug 2019 19:02:34 +0000 (14:02 -0500)
* 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>
1  2 
src/os/bluestore/BlueStore.cc

Simple merge