summaryrefslogtreecommitdiff
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-04-25 10:58:57 -0400
committerJeff Forcier <jeff@bitprophet.org>2022-04-25 10:58:57 -0400
commit617b5cbe19145e076d2ee02d588a371a80559931 (patch)
tree55ba696012ce1822bd55dae89e7ee2b77e496ff3 /sites
parentf2b4be883adad4cb80a39312cf45a6d3248432a6 (diff)
parent70e28ac7cb2a8a5f0ff84ad877b2739f82079086 (diff)
downloadparamiko-617b5cbe19145e076d2ee02d588a371a80559931.tar.gz
Merge branch '2.10'
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0f60a3bb..61ff733f 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,11 +2,12 @@
Changelog
=========
-- :support:`1838` (via :issue:`1870`/:issue:`2028`) Update ``camelCase`` method
- calls against the ``threading`` module to be ``snake_case``; this and related
- tweaks should fix some deprecation warnings under Python 3.10. Thanks to
- Karthikeyan Singaravelan for the report, ``@Narendra-Neerukonda`` for the
- patch, and to Thomas Grainger and Jun Omae for patch workshopping.
+- :support:`1838 backported` (via :issue:`1870`/:issue:`2028`) Update
+ ``camelCase`` method calls against the ``threading`` module to be
+ ``snake_case``; this and related tweaks should fix some deprecation warnings
+ under Python 3.10. Thanks to Karthikeyan Singaravelan for the report,
+ ``@Narendra-Neerukonda`` for the patch, and to Thomas Grainger and Jun Omae
+ for patch workshopping.
- :feature:`1951` Add SSH config token expansion (eg ``%h``, ``%p``) when
parsing ``ProxyJump`` directives. Patch courtesy of Bruno Inec.
- :bug:`1964` (via :issue:`2024` as also reported in :issue:`2023`)