diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:53:09 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:53:09 -0700 |
| commit | c0f1da60bd7da55bf7a2051a329192c1c018f099 (patch) | |
| tree | 86927ac72ee1adef71db6f68fae2d028d1d59953 /sites/www | |
| parent | e520165eeec1b7c2d165ab611f7947b6c8d4da0f (diff) | |
| parent | 57106d04def84ca1d9dd23c4d85b2ba9242556ff (diff) | |
Merge branch '1.15'
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index fb09b7a1..bbc89b75 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :bug:`491` (combines :issue:`62` and :issue:`439`) Implement timeout + functionality to address hangs from dropped network connections and/or failed + handshakes. Credit to ``@vazir`` and ``@dacut`` for the original patches and + to Olle Lundberg for reimplementation. * :bug:`490` Skip invalid/unparseable lines in ``known_hosts`` files, instead of raising `SSHException`. This brings Paramiko's behavior more in line with OpenSSH, which silently ignores such input. Catch & patch courtesy of Martin |