]> granicus.if.org Git - apache/commitdiff
And we are 2.4.18-dev
authorJim Jagielski <jim@apache.org>
Fri, 9 Oct 2015 17:26:05 +0000 (17:26 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 9 Oct 2015 17:26:05 +0000 (17:26 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707774 13f79535-47bb-0310-9956-ffa450edef68

CHANGES
STATUS
docs/manual/style/version.ent
include/ap_release.h

diff --git a/CHANGES b/CHANGES
index 020aea1a49f5dcb43ba53f1d5d30ac0e22ae2f1f..c7e204f9b0a47855ca58e61b80259cc87645d322 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.18
+
+
 Changes with Apache 2.4.17
 
   *) mod_http2: added donated HTTP/2 implementation via core module. Similar
diff --git a/STATUS b/STATUS
index 4370d0af9ef2e854d62c9b9dc40f127ea120a4ff..6d0da342ffb0515326ffb8746c9e143234e3f564 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -34,6 +34,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.4.18  : In development.
     2.4.17  : Tagged on October 9, 2015.
     2.4.16  : Tagged on July 9, 2015. Released July 15, 2015
     2.4.15  : Tagged on June 19, 2015. Not released.
index bf0e231644d10f44a8eb3fb3f266d460badb2395..5ae59604a2dcc510abddc44235d3956de1d116b5 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "17">
+<!ENTITY httpd.patch "18">
 
 <!ENTITY httpd.docs "2.4">
index 0b49ada5eee0efaaa2652c2941d1ee3e14a843a3..f7785bba2837e705fd0efcb9592fcd3e652ea46f 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   17
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   18
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */