From: Sage Weil <sage@redhat.com>
Date: Tue, 20 Nov 2018 23:35:16 +0000 (-0600)
Subject: Merge PR #25167 into master
X-Git-Tag: v14.1.0~853
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0810de25b58550faf37768da241fd2d1e4610fb;p=ceph-ci.git

Merge PR #25167 into master

* refs/pull/25167/head:
	mgr: Diskprediction local activate when config changes

Reviewed-by: Sage Weil <sage@redhat.com>
---

d0810de25b58550faf37768da241fd2d1e4610fb