summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-09-18 18:00:59 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-09-18 18:00:59 -0700
commit848a7209e29d580594d35f299b01db97714caf92 (patch)
tree57425aa20493dccc62bc95e59268fde66eeb368f /sites/www
parent6ee3f1a074d2b13cca2a5d267f16159f294b98c6 (diff)
parent16a8df33eb4e9723fea244959db2b157be825781 (diff)
Merge branch 'master' into switch-to-cryptography
Conflicts: paramiko/ecdsakey.py tests/test_client.py
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 38a56101..d0bd481c 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.15.0 <2014-09-18>`
* :support:`393` Replace internal use of PyCrypto's ``SHA.new`` with the
stdlib's ``hashlib.sha1``. Thanks to Alex Gaynor.
* :feature:`267` (also :issue:`250`, :issue:`241`, :issue:`228`) Add GSS-API /