From: Sage Weil <sage@redhat.com>
Date: Fri, 9 Nov 2018 14:37:10 +0000 (-0600)
Subject: Merge PR #24925 into master
X-Git-Tag: v14.1.0~955
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8f3d7a6d56d9a1e0709256bd8512f850cfe01354;p=ceph-ci.git

Merge PR #24925 into master

* refs/pull/24925/head:
	Avoid import _strptime failed
	Avoid exception if remote plugin not enabled
	Separate diskprediction local plugin from the diskprediction plugin

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

8f3d7a6d56d9a1e0709256bd8512f850cfe01354