]> granicus.if.org Git - apache/commitdiff
And we are 2.4.2-dev
authorJim Jagielski <jim@apache.org>
Mon, 13 Feb 2012 13:37:55 +0000 (13:37 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 13 Feb 2012 13:37:55 +0000 (13:37 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1243504 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index e9e43832f27854a1025b57dd72d78fb04ad89dbd..5825ca82fea24038b100a48b25e03b6b37248058 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+
+Changes with Apache 2.4.2
+
+
 Changes with Apache 2.4.1
 
   *) SECURITY: CVE-2012-0053 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index a86256562e02007cdf4539ff8d758f6d3e5c7a15..fa25e447f2304c1962426a2aca482f04a37f0f5d 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.2   : In development.
     2.4.1   : Tagged on February 13, 2012.
     2.4.0   : Tagged on January 16, 2012, not released.
     2.3.16  : Tagged on December 15, 2011.
index 406969b87eeaf58601bf06eb725b6ba4c84b2e41..f1f42a89d56fdf9c382867b2b4085bcb8d12f0f6 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "1">
+<!ENTITY httpd.patch "2">
 
 <!ENTITY httpd.docs "2.4">
index 6e799129c0ea19e47e12ce86b82999ac5a831868..03480c83609ca145484003b5f7a2febaffc472a6 100644 (file)
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   1
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   2
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 #define AP_SERVER_ADD_STRING          "-dev"
 
 /* Synchronize the above with docs/manual/style/version.ent */