From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Apr 2019 11:54:35 +0000 (-0500)
Subject: Merge PR #27516 into master
X-Git-Tag: v15.1.0~2953
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd36f2a83626055fc2df1a834dd4a5be19c81aba;p=ceph.git

Merge PR #27516 into master

* refs/pull/27516/head:
	mgr/rook: Fix Python 2 regression

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gabriel Brascher <gabriel@apache.org>
---

fd36f2a83626055fc2df1a834dd4a5be19c81aba
diff --cc .githubmap
index 79a3dbb80394,79a3dbb80394..f9d2ace5df54
--- a/.githubmap
+++ b/.githubmap
@@@ -97,3 -97,3 +97,4 @@@ mikechristie Mike Christie <mchristi@re
  andrewschoen Andrew Schoen <aschoen@redhat.com>
  mattbenjamin Matt Benjamin <mbenjami@redhat.com>
  baruza Barbora Ančincová <bara@redhat.com>
++GabrielBrascher Gabriel Brascher <gabriel@apache.org>