Merge PR #31524 into master

author Sage Weil <sage@redhat.com>

Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)

committer Sage Weil <sage@redhat.com>

Mon, 11 Nov 2019 16:15:19 +0000 (10:15 -0600)
author Sage Weil <sage@redhat.com>
Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)
committer Sage Weil <sage@redhat.com>
Mon, 11 Nov 2019 16:15:19 +0000 (10:15 -0600)
diff --cc .githubmap

index 8e63cfe6e85c3d7014c1eaf99d32e1638cd2e851,8e63cfe6e85c3d7014c1eaf99d32e1638cd2e851..87a70cd17bf4259fe9d5ed45f89a661444528fc2
--- 1/.githubmap
--- 2/.githubmap
+++ b/.githubmap
@@@ -106,3 -106,3 +106,4 @@@ varshar16 Varsha Rao <varao@redhat.com
   guits Guillaume Abrioux <gabrioux@redhat.com>
   mgfritch Michael Fritch <mfritch@suse.com>
   xiaoxichen Xiaoxi Chen <superdebuger@gmail.com>
++toabctl Thomas Bechtold <tbechtold@suse.com>
diff --cc src/pybind/mgr/ssh/module.py
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)
committer	Sage Weil <sage@redhat.com>
	Mon, 11 Nov 2019 16:15:19 +0000 (10:15 -0600)
		1	2
.githubmap	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/ssh/module.py	patch \|	diff1 \|	diff2 \|	blob \| history