From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Feb 2019 18:40:55 +0000 (-0600)
Subject: Merge PR #26112 into master
X-Git-Tag: v14.1.0~230
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3b5b96b90a008fb3f9e482c6edf2b0c2e3388eec;p=ceph-ci.git

Merge PR #26112 into master

* refs/pull/26112/head:
	mgr: load modules in finisher to avoid potential lock cycles

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
---

3b5b96b90a008fb3f9e482c6edf2b0c2e3388eec
diff --cc .githubmap
index b856e29bdb7,b856e29bdb7..d54b0516171
--- a/.githubmap
+++ b/.githubmap
@@@ -91,3 -91,3 +91,4 @@@ tserong Tim Serong <tserong@suse.com
  hsiang41 Rick Chen <rick.chen@prophetstor.com>
  djgalloway David Galloway <dgallowa@redhat.com>
  Yan-waller yanjun <yan.jun8@zte.com.cn>
++b-ranto Boris Ranto <branto@redhat.com>