summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 20:06:56 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 20:06:56 -0800
commit1d3ce6de95ac602a1a27d9a09b5de557bee07abf (patch)
tree4c97d35a970bf2c06ff2c6a84b1fa83637bd093e /sites/www/changelog.rst
parent4d95a2b7c344d4945b46020d0cbf6f548b543354 (diff)
parent594ecebef6b3158421c86a7ee139eed1b58694ce (diff)
Merge branch '1.17' into 1.18
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0af940ea..9a37c7b2 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :support:`792 (1.17+)` Minor updates to the README and demos; thanks to Alan
+ Yee.
* :feature:`780 (1.18+)` (also :issue:`779`, and may help users affected by
:issue:`520`) Add an optional ``timeout`` parameter to
`Transport.start_client <paramiko.transport.Transport.start_client>` (and