summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-12-15 12:40:25 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-12-15 12:40:25 -0800
commitf29ff012f9530a00800f746cb5f2072642731222 (patch)
tree5b7740ba3fe827dbf7e8ca525410509105f7c6bd
parente57e4ba1c44b05d0d4ce5f50be4b8676d9df79ed (diff)
parentf4063c176fe0845ae134efc4849c35bd8ee24033 (diff)
Merge branch '1.13' into 1.14
-rw-r--r--paramiko/transport.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index eb488a18..e8d3ef68 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -964,6 +964,8 @@ class Transport (threading.Thread):
supplied, this method returns ``None``.
:returns: server supplied banner (`str`), or ``None``.
+
+ .. versionadded:: 1.13
"""
if not self.active or (self.auth_handler is None):
return None