summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-09 15:07:59 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-09 15:07:59 -0700
commit6a89558040a6173536a9a9af264b5f0bad2d76c8 (patch)
tree0423de7c81b6224b4f5b4b2dba8f95dea940da5f /sites/www
parent8eb087d71ae7005dabfc0d57bb3ae79d9a325bc1 (diff)
parent295b50e91db5dd37bb29c3f209c7168a1ef16e00 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 46d26657..fc40953a 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :release:`2.0.6 <2017-06-09>`
+* :release:`1.18.3 <2017-06-09>`
+* :release:`1.17.5 <2017-06-09>`
* :bug:`865` SSHClient now requests the type of host key it has (e.g. from
known_hosts) and does not consider a different type to be a "Missing" host
key. This fixes a common case where an ECDSA key is in known_hosts and the