From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Dec 2019 20:44:37 +0000 (-0600)
Subject: Merge PR #32102 into master
X-Git-Tag: v15.1.0~600
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5993dd82b0607339412e59e22e7b6a00c22aafbc;p=ceph-ci.git

Merge PR #32102 into master

* refs/pull/32102/head:
	mgr/diskprediction_local: import scipy early to fix self-test deadlock

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

5993dd82b0607339412e59e22e7b6a00c22aafbc