From: Stefan Eissing <icing@apache.org>
Date: Fri, 23 Dec 2016 12:47:27 +0000 (+0000)
Subject: On the trunk: update after backport
X-Git-Tag: 2.5.0-alpha~876
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c217708281295c888c59bfaab49e370dc8b6c5cc;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk: update after backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1775835 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 5b8986bf3cd..92e1c4bdf3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: cleanup beamer registry on server reload, Fixes PR60510.
-     [Pavel Mateja <pavel@verotel.cz>, Stefan Eissing]
-     
   *) mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
      backend connection, happening with LogLevel trace2 or higher configured,
      or at any log level with compilers not detected as C99 compliant (e.g.