summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-04-25 12:25:41 -0400
committerJeff Forcier <jeff@bitprophet.org>2022-04-25 12:25:41 -0400
commit4787ba781430d067ce3920e5cba82e9e6fcc69e1 (patch)
tree1802264668d1de21fb0d853f87aa7bdf28cd567f
parent70e28ac7cb2a8a5f0ff84ad877b2739f82079086 (diff)
parent943b733c4701b0b4fb56e4651727b97ab4ca7f0b (diff)
downloadparamiko-4787ba781430d067ce3920e5cba82e9e6fcc69e1.tar.gz
Merge branch '2.9' into 2.10
-rw-r--r--sites/www/changelog.rst1
-rw-r--r--tasks.py1
2 files changed, 1 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index cc8167d6..218f4575 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+- :release:`2.9.4 <2022-04-25>`
- :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
diff --git a/tasks.py b/tasks.py
index 2e105297..ae408059 100644
--- a/tasks.py
+++ b/tasks.py
@@ -125,7 +125,6 @@ def all_(c, dry_run=False):
release_coll["prepare"](c, dry_run=dry_run)
publish_(c, dry_run=dry_run)
release_coll["push"](c, dry_run=dry_run)
- release_coll["tidelift"](c, dry_run=dry_run)
# TODO: "replace one task with another" needs a better public API, this is