summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:06:54 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:06:54 -0700
commitb58beb4dd0211092e352fd01af0be5e6550c9db5 (patch)
tree84a58047573020329ec9ff45d2d42444a9bf619f /sites/www/changelog.rst
parent20e0285628cd5f075b6f81c897a440e2eb5da95e (diff)
parentd20f8b9820294006ee078944ca9eb01a41b65dd8 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www/changelog.rst')
-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 cac5a715..0ed3e587 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.18.4 <2017-09-18>`
* :bug:`1061` Clean up GSSAPI authentication procedures so they do not prevent
normal fallback to other authentication methods on failure. (In other words,
presence of GSSAPI functionality on a target server precluded use of _any_