summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-09 12:55:55 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-09 12:55:55 -0700
commitbf5f4fe7ff90c9ad41569dde8ae38241ac89f73d (patch)
tree82b5261fd23ef2799e09a92a5eb0c84574d3edb9 /sites/www/changelog.rst
parent1214fbff0f07fb9fb87cea5f536fc67b40ae99cc (diff)
parenta234be3261b2d03288398fdbd7ccff10ab51fd33 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r--sites/www/changelog.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 706385cb..e9adee21 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,13 +2,6 @@
Changelog
=========
-* :support:`956 backported` Switch code coverage service from coveralls.io to
- codecov.io (& then disable the latter's auto-comments.) Thanks to Nikolai
- Røed Kristiansen for the patch.
-* :bug:`949` SSHClient and Transport could cause a memory leak if there's
- a connection problem or protocol error, even if ``Transport.close()``
- is called. Thanks Kyle Agronick for the discovery and investigation,
- and Pierce Lopez for assistance.
* :bug:`741` (also :issue:`809`, :issue:`772`; all via :issue:`912`) Writing
encrypted/password-protected private key files was silently broken since 2.0
due to an incorrect API call; this has been fixed.
@@ -19,6 +12,9 @@ Changelog
Thanks to ``@virlos`` for the original report, Chris Harris and ``@ibuler``
for initial draft PRs, and ``@jhgorrell`` for the final patch.
+* :support:`956 (1.17+)` Switch code coverage service from coveralls.io to
+ codecov.io (& then disable the latter's auto-comments.) Thanks to Nikolai
+ Røed Kristiansen for the patch.
* :bug:`983` Move ``sha1`` above the now-arguably-broken ``md5`` in the list of
preferred MAC algorithms, as an incremental security improvement for users
whose target systems offer both. Credit: Pierce Lopez.
@@ -43,8 +39,12 @@ Changelog
(i.e. passes the maintainer's preferred `flake8 <http://flake8.pycqa.org/>`_
configuration) and add a ``flake8`` step to the Travis config. Big thanks to
Dorian Pula!
-* :bug:`683` Make ``util.log_to_file`` append instead of replace. Thanks
- to ``@vlcinsky`` for the report.
+* :bug:`949 (1.17+)` SSHClient and Transport could cause a memory leak if
+ there's a connection problem or protocol error, even if ``Transport.close()``
+ is called. Thanks Kyle Agronick for the discovery and investigation, and
+ Pierce Lopez for assistance.
+* :bug:`683 (1.17+)` Make ``util.log_to_file`` append instead of replace.
+ Thanks to ``@vlcinsky`` for the report.
* :release:`2.1.2 <2017-02-20>`
* :release:`2.0.5 <2017-02-20>`
* :release:`1.18.2 <2017-02-20>`