diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:43:44 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:44:18 -0800 |
| commit | 3a4c383043635546b43920f9486c017ad8573bc3 (patch) | |
| tree | 17f87527abe36a19397871e86e29ed616c99c5e9 /sites/www/changelog.rst | |
| parent | e4273b3f236f279a15ced43e6ee707bfea80beb7 (diff) | |
Meh
Diffstat (limited to 'sites/www/changelog.rst')
| -rw-r--r-- | sites/www/changelog.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index fc1afcbd..e71ba5a1 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,11 +2,11 @@ Changelog ========= -* :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:`-` 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 + ``AttributeError``.) The offending code has been stripped out of the 2.0.x + line (but of course, remains in 2.1.x and above.) * :release:`2.0.3 <2016-12-09>` * :release:`1.18.0 <2016-12-09>` * :release:`1.17.3 <2016-12-09>` |