From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Oct 2018 22:56:43 +0000 (-0500)
Subject: Merge PR #24558 into master
X-Git-Tag: v14.0.1~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06af843bbc5895a831954de8b50ceb8fe1a32bbb;p=ceph.git

Merge PR #24558 into master

* refs/pull/24558/head:
	pybind/mgr: Fix Python 3 imports in diskprediction & insights

Reviewed-by: Noah Watkins <nwatkins@redhat.com>
---

06af843bbc5895a831954de8b50ceb8fe1a32bbb
diff --cc .githubmap
index fc0f6a7dba03,c85f8efde2a6..22bc744c9fd7
--- a/.githubmap
+++ b/.githubmap
@@@ -82,4 -83,3 +82,5 @@@ vshankar Venky Shankar <vshankar@redhat
  adamemerson Adam C. Emerson <aemerson@redhat.com>
  myoungwon Myoungwon Oh <omwmw@sk.com>
  dillaman Jason Dillaman <dillaman@redhat.com>
 +batrick Patrick Donnelly <pdonnell@redhat.com>
++noahdesu Noah Watkins <nwatkins@redhat.com>