And bump after tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@564747 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 8bf0742c804b452a097816fe1a4f7ed3c10d078e..bd178f3a240a53247a6aa3d4e55d68000810a1f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
                                                         -*- coding: utf-8 -*-
+Changes with Apache 2.2.6
+
+
 Changes with Apache 2.2.5
 
   *) SECURITY: CVE-2007-3847 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index cef3e17e45e1e274776cdd1f0bb122f637e29ab6..b4c93ef65ddb5745daf43e46cff35c7827041aef 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -26,6 +26,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.2.6   : In development
     2.2.5   : Tagged August 10, 2007
     2.2.4   : Released on January 9, 2007 as GA.
     2.2.3   : Released on July 28, 2006 as GA.

diff --git a/include/ap_release.h b/include/ap_release.h
index a74a641df637ba83a737626ed6c3d3bcf8438646..f55e23a28af1001c8ab65604e7fe1df6e8f2aa6c 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   5
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   6
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"