diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-02-20 14:28:57 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-02-20 14:28:57 -0800 |
| commit | f58afa4bdf6d0194669a354e1d6272950d5d0c33 (patch) | |
| tree | d53a45d4e8d02209c90d8ad663c9a571140b7ada /sites/www | |
| parent | 6e054ed8a98cdb938c3423461d5e2ea450e543ad (diff) | |
| parent | 598c877abb73abc9c57fa3444ba24f3dd1c628b9 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 19909725..8c0b646c 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -17,8 +17,8 @@ Changelog * :release:`2.1.1 <2016-12-12>` * :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 +* :bug:`859 (1.18+)` (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 |