]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32102 into master
authorSage Weil <sage@redhat.com>
Mon, 9 Dec 2019 20:44:37 +0000 (14:44 -0600)
committerSage Weil <sage@redhat.com>
Mon, 9 Dec 2019 20:44:37 +0000 (14:44 -0600)
* refs/pull/32102/head:
mgr/diskprediction_local: import scipy early to fix self-test deadlock

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

Trivial merge