From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Oct 2018 15:20:02 +0000 (-0500)
Subject: Merge PR #24755 into master
X-Git-Tag: v14.1.0~1045
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96dd773d13754ded81946a1a38570a2e8f2e42cb;p=ceph.git

Merge PR #24755 into master

* refs/pull/24755/head:
	mgr/diskprediction: use global device_failure_prediction_mode setting

Reviewed-by: John Spray <john.spray@redhat.com>
---

96dd773d13754ded81946a1a38570a2e8f2e42cb