From: Stefan Eissing <icing@apache.org>
Date: Tue, 11 Oct 2016 13:42:33 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.5.0-alpha~1100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87863e4e80525b64d3ea025750dac5a49e7849ec;p=apache

update after backport

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

diff --git a/CHANGES b/CHANGES
index 7d026a90f2..4630dc2839 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_proxy_http2: fixed duplicate symbols with mod_http2.
-  
   *) mod_dav: Fix a potential cause of unbounded memory usage or incorrect
      behavior in a routine that sends <DAV:response>'s to the output filters.
      [Evgeny Kotkov]
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 9ae5b751ed..fba1b231ad 100644
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.7.4-DEV"
+#define MOD_HTTP2_VERSION "1.7.5-DEV"
 
 /**
  * @macro
@@ -34,7 +34,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_HTTP2_VERSION_NUM 0x010704
+#define MOD_HTTP2_VERSION_NUM 0x010705
 
 
 #endif /* mod_h2_h2_version_h */