diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:40:21 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:40:21 -0800 |
| commit | 5ec27afb96168bcf0f98f09e336aab88e3d62672 (patch) | |
| tree | 86087d89e3e92502791e330f7d6201b09e6735ab /sites/www | |
| parent | fa6273526b027432525dceafb288747eba311d29 (diff) | |
| parent | 927656e9d88944cc4484bfcc4479ebda59d2aba1 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0da73cb8..454b9758 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +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:`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``. |