From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Dec 2019 20:42:49 +0000 (-0600)
Subject: Merge PR #32044 into master
X-Git-Tag: v15.1.0~619
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d73fe9cbd695415d25c794b6d5cc6a96d960231c;p=ceph-ci.git

Merge PR #32044 into master

* refs/pull/32044/head:
	mon/OSDMonitor: make memory autotune disable itself if no rocksdb

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

d73fe9cbd695415d25c794b6d5cc6a96d960231c