]> granicus.if.org Git - apache/commitdiff
And we are at 2.4.6-dev
authorJim Jagielski <jim@apache.org>
Thu, 11 Jul 2013 18:33:07 +0000 (18:33 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 11 Jul 2013 18:33:07 +0000 (18:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1502324 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index 6aa9421f39c10d961f5e817239a7db4fc87a4aae..b8618e27107cc88bfec270ebbb20e6f8be160864 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.6
+
+
 Changes with Apache 2.4.5
 
   *) SECURITY: CVE-2013-1896 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 1554b476fcdb9308a4172fd7273fce58f8434104..8be6fabded4b35a4efef192a14566e5f88dc9416 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.6   : In development
     2.4.5   : Tagged on July 11, 2013.
     2.4.4   : Tagged on February 18, 2013. Released Feb 25, 2013
     2.4.3   : Tagged on August 17, 2012. Released Aug 18, 2012
index c3f63ef2b0ff5588e293dd4bdc1cb505710b313d..63425133a4f2f40c5f685fa48224ab03a4fb7809 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "5">
+<!ENTITY httpd.patch "6">
 
 <!ENTITY httpd.docs "2.4">
index 3dfab27263d08a3dd8ce0f9bb4e876e4fff16b48..414278c1495c9dcc7a5147621e6ed7660518204a 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   5
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   6
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */