diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:44:37 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:44:37 -0800 |
| commit | 3a68759d6f93a525d0067013c4a13f638faad9f6 (patch) | |
| tree | 1432ebacc65498b8a9aa395f71c1dd1ac27a5930 | |
| parent | 317fec31f9cff564c7e5ba769bc0a77c7ba861a7 (diff) | |
| parent | 3a4c383043635546b43920f9486c017ad8573bc3 (diff) | |
Merge branch '2.0' into 2.1
| -rw-r--r-- | sites/www/changelog.rst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 46fc3b15..006f6c48 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,11 +2,12 @@ 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. +<<<<<<< HEAD +* :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.) * :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``. |