diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 12:02:27 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 12:02:27 -0700 |
| commit | 4c7135552b4de138eda540339faad73220337caf (patch) | |
| tree | b7e6336b6134f09daf6e1a4774715c727c62fa1b | |
| parent | 6062b69e27960be1f98883831ca1afc5b9495582 (diff) | |
| parent | 98f9d8285e03671b8cb1a8fa13afb651f5e8f37a (diff) | |
Merge branch '1.15' into 1.16
| -rw-r--r-- | paramiko/transport.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index ce13dab6..75f3ef75 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -693,6 +693,8 @@ class Transport (threading.Thread, ClosingContextManager): :raises SSHException: if the request is rejected or the session ends prematurely + .. versionchanged:: 1.13.4/1.14.3/1.15.3 + Added the ``timeout`` argument. .. versionchanged:: 1.15 Added the ``window_size`` and ``max_packet_size`` arguments. """ |