From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Feb 2020 22:08:40 +0000 (-0600)
Subject: Merge PR #33056 into master
X-Git-Tag: v15.1.1~533
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7b7e2e36febfb7d178d5233bd52cf1c36d96146;p=ceph.git

Merge PR #33056 into master

* refs/pull/33056/head:
	common: fix clang compile errors from cython_modules

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

e7b7e2e36febfb7d178d5233bd52cf1c36d96146
diff --cc .githubmap
index 0f70169b6585,9958f3f7d9a8..bc354aaab1ea
--- a/.githubmap
+++ b/.githubmap
@@@ -112,4 -112,3 +112,5 @@@ jschmid1 Joshua Schmid <jschmid@suse.de
  bk201 Kiefer Chang <kiefer.chang@suse.com>
  alimaredia Ali Maredia <amaredia@redhat.com>
  ideepika Deepika Upadhyay <dupadhya@redhat.com>
 +p-se Patrick Seidensal <pseidensal@suse.com>
++ronen-fr Ronen Friedman <rfriedma@redhat.com>