summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-08 16:37:57 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-08 16:37:57 -0700
commite05f3bce49c38b2b861bda4a96b0b8f19a84863a (patch)
treee902ab812a95f69617716de89cdb079d2ebeacd8 /sites/www
parent150b0797e935ebf2f62e86ae1c08a1a1ab94c459 (diff)
Tweak changelog again for more tickets, use actually-merged PR as main issue number
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 3be56890..1dab5219 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,9 +2,10 @@
Changelog
=========
-* :feature:`250` (also :issue:`267`) Add GSS-API / SSPI (e.g. Kerberos) key
- exchange and authentication support (:ref:`installation docs here <gssapi>`).
- Mega thanks to Sebastian Deiß, with assist by Torsten Landschoff.
+* :feature:`267` (also :issue:`250`, :issue:`241`, :issue:`228`) Add GSS-API /
+ SSPI (e.g. Kerberos) key exchange and authentication support
+ (:ref:`installation docs here <gssapi>`). Mega thanks to Sebastian Deiß, with
+ assist by Torsten Landschoff.
* :bug:`346 major` Fix an issue in private key files' encryption salts that
could cause tracebacks and file corruption if keys were re-encrypted. Credit
to Xavier Nunn.