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 | 5cc85375ca094b398f20acc9f978b88a6d7a9ef4 (patch) | |
| tree | 831495d64595cad9821df368b37cde2d1f932f9e | |
| parent | d5ec63306c48ef25101129dad371733582a463a8 (diff) | |
| parent | 8b95faecd280112c1db3a8b8055ac9643fd41539 (diff) | |
Merge branch '1.17' into 2.0
| -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 9fcaa9fb..b52d3158 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -694,6 +694,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. """ |