summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-12 16:12:28 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-12 16:12:28 -0800
commit485405212e0f9a5849d7350b1d3a8c884d7b144c (patch)
tree67101861971869483421f102ccd1f0392061d4f3 /sites
parenta70b78e0dfd6c0fcb01a5aeb14f0244f9596d116 (diff)
parent51cafed29a8b87f58718f55a449a8c4e499addb4 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 4e4c9b2d..2b70b4e9 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
Changelog
=========
+* :release:`2.0.4 <2016-12-12>`
+* :release:`1.18.1 <2016-12-12>`
+* :bug:`859` (via :issue:`860`) A tweak to the original patch implementing
+ :issue:`398` was not fully applied, causing calls to
+ `~paramiko.client.SSHClient.invoke_shell` to fail with ``AttributeError``.
+ This has been fixed. Patch credit: Kirk Byers.
* :bug:`-` Accidentally merged the new features from 1.18.0 into the
2.0.x bugfix-only branch. This included merging a bug in one of those new
features (breaking `~paramiko.client.SSHClient.invoke_shell` with an