From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Feb 2019 16:36:03 +0000 (-0600)
Subject: Merge PR #26445 into master
X-Git-Tag: v14.1.0~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d01c9e576cf604410b897400cbe02d45e137bc40;p=ceph.git

Merge PR #26445 into master

* refs/pull/26445/head:
	mgr: hold GIL while generating a typed option value
	mgr/ActivePyModules: do not touch PyFormatter without the GIL

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
---

d01c9e576cf604410b897400cbe02d45e137bc40