]> granicus.if.org Git - apache/commitdiff
And we are at 2.4.1-dev
authorJim Jagielski <jim@apache.org>
Mon, 16 Jan 2012 17:35:39 +0000 (17:35 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 16 Jan 2012 17:35:39 +0000 (17:35 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1232071 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index da2423ee028f0bf6d17fd3fc80285b382902a9ea..07ee56625c7d6e35bf08675583c61e3c12239bf9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.4.1
+
+
 Changes with Apache 2.4.0
 
   *) SECURITY (CVE-2012-0031): Fix scoreboard issue which could allow
diff --git a/STATUS b/STATUS
index ac8211ec22603fd59a7ba48b7869b24804c3b7cc..abea0fd976fa139e220a11dfd5303b68f9054d2c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -32,6 +32,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.1   : In development.
     2.4.0   : Tagged on January 16, 2012.
     2.3.16  : Tagged on December 15, 2011.
     2.3.15  : Tagged on November 8, 2011. Released Nov. 15, 2011.
index 706c06a134c52745786cfc9c04260a7a09790453..406969b87eeaf58601bf06eb725b6ba4c84b2e41 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "0">
+<!ENTITY httpd.patch "1">
 
 <!ENTITY httpd.docs "2.4">
index be2b98e85e7220e48d48e28f8ecb174f854dd9fe..efb15d80a8855b3a935a5b923aa96cac53d31042 100644 (file)
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   0
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   1
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 #define AP_SERVER_ADD_STRING          "-dev"
 
 /* Synchronize the above with docs/manual/style/version.ent */