summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-11-04 18:10:07 -0400
committerJeff Forcier <jeff@bitprophet.org>2022-11-04 18:10:07 -0400
commitfd6e3b488987dc56f86f3d3946633e76ece6d943 (patch)
treed87e55dc2a447efad881f84a299df6e2dba9a9c7
parent468bdae169dddcc8a7bc718067aa2d366c1f6416 (diff)
parent433189fd2a901e98071b4389d662c30323f47212 (diff)
downloadparamiko-fd6e3b488987dc56f86f3d3946633e76ece6d943.tar.gz
Merge branch '2.10' into 2.11
-rw-r--r--sites/www/changelog.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 556ed019..c0dbd7cc 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -9,11 +9,11 @@ Changelog
errors (though we hasten to remind everyone that Client and Transport have
their own ``.close()`` methods for use in non-error situations!). Patch
courtesy of ``@YoavCohen``.
-- bug:`1637` (via :issue:`1599`) Raise `SSHException` explicitly when blank
- private key data is loaded, instead of the natural result of ``IndexError``.
- This should help more bits of Paramiko or Paramiko-adjacent codebases to
- correctly handle this class of error. Credit: Nicholas Dietz.
-- :release:`2.11.0 <2022-05-16>`
+- bug:`1637` (via :issue:`1599`) Raise `~paramiko.ssh_exception.SSHException`
+ explicitly when blank private key data is loaded, instead of the natural
+ result of ``IndexError``. This should help more bits of Paramiko or
+ Paramiko-adjacent codebases to correctly handle this class of error. Credit:
+ Nicholas Dietz.
- :release:`2.10.5 <2022-05-16>`
- :release:`2.9.5 <2022-05-16>`
- :bug:`1933` Align signature verification algorithm with OpenSSH re: