]> granicus.if.org Git - apache/commitdiff
And we are 2.4.21-dev
authorJim Jagielski <jim@apache.org>
Mon, 4 Apr 2016 16:09:26 +0000 (16:09 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 4 Apr 2016 16:09:26 +0000 (16:09 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737701 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index 65c8b54a8a0841cc07090c4ba488d6a4436382cb..9ae8a02231765d552e5862c6a7250562d1346aac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.21
+
+
 Changes with Apache 2.4.20
 
   *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
diff --git a/STATUS b/STATUS
index 3846da73c17400efc62f3cdba20662eee8b053f6..75b153b2ee9d018531f6967b7101544517b176a6 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.21  : In development.
     2.4.20  : Tagged on April 4, 2016.
     2.4.19  : Tagged on March 21, 2016, not released.
     2.4.18  : Tagged on December 8, 2015. Released on December 14, 2015.
index e549cb7d4a46418c23d3ef952988c5c421f797e7..90f5fc49a64128bb804d7e6f6edcbad23ae52076 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "20">
+<!ENTITY httpd.patch "21">
 
 <!ENTITY httpd.docs "2.4">
index becf09cf7056a3a782c6666f57a7e70d4e65fc7a..6d5209ed78f9025fe1d7d114c67479097ad80ff3 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   20
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   21
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */