summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-04-25 10:58:42 -0400
committerJeff Forcier <jeff@bitprophet.org>2022-04-25 10:58:42 -0400
commit70e28ac7cb2a8a5f0ff84ad877b2739f82079086 (patch)
treefe2f30c9507d8cfc2fe326261da38e39fa1ace13
parent5540514928474956c25936ab48f7fa0b59755bb1 (diff)
parentff772c9d93f79fc4287f7cc4af39a70afb799c75 (diff)
Merge branch '2.9' into 2.10
-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 7d5e81f6..cc8167d6 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.
- :bug:`1964` (via :issue:`2024` as also reported in :issue:`2023`)
`~paramiko.pkey.PKey` instances' ``__eq__`` did not have the usual safety
guard in place to ensure they were being compared to another ``PKey`` object,