]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #31524 into master
authorSage Weil <sage@redhat.com>
Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)
committerSage Weil <sage@redhat.com>
Mon, 11 Nov 2019 16:15:19 +0000 (10:15 -0600)
* refs/pull/31524/head:
mgr/ssh: Fix various Python issues.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
1  2 
.githubmap
src/pybind/mgr/ssh/module.py

diff --cc .githubmap
index 8e63cfe6e85c3d7014c1eaf99d32e1638cd2e851,8e63cfe6e85c3d7014c1eaf99d32e1638cd2e851..87a70cd17bf4259fe9d5ed45f89a661444528fc2
@@@ -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>
Simple merge