summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-12 15:42:02 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-12 15:42:02 -0800
commit317fec31f9cff564c7e5ba769bc0a77c7ba861a7 (patch)
tree06b2e5f9ba32e636f8b319984b6b7c9ca11c18b7 /sites
parent5ec27afb96168bcf0f98f09e336aab88e3d62672 (diff)
parente4273b3f236f279a15ced43e6ee707bfea80beb7 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites')
-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 454b9758..46fc3b15 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,11 +2,11 @@
Changelog
=========
-* :bug:`-` Accidentally merged the new features from 1.1.80 into the 2.0 line.
- (We're obviously still new at managing split feature/bug releases on both
- sides of a major version bump!). This included merging a bug in one of those
- new features (breaking `~paramiko.client.SSHClient.invoke_shell` with an
- ``AttributeError``.) The offending code has been stripped out.
+* :bug:`- (2.0)` Accidentally merged the new features from 1.1.80 into the 2.0
+ line. (We're obviously still new at managing split feature/bug releases on
+ both sides of a major version bump!). This included merging a bug in one of
+ those new features (breaking `~paramiko.client.SSHClient.invoke_shell` with
+ an ``AttributeError``.) The offending code has been stripped out.
* :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``.