Roll on to 2.2.2-dev.

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

diff --git a/CHANGES b/CHANGES
index be5301960a2cb0561dd1f206998f5684040efdd9..5af4f648c219507a949805623b00b66ec18951d9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
                                                         -*- coding: utf-8 -*-
+Changes with Apache 2.2.2
+
+
 Changes with Apache 2.2.1
 
   *) SECURITY: CVE-2005-3357 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index b1667ffcbb32b5f9b1720acd4709df9ed860afc7..8457c205cd874ddeebfbc8f50723aca2d39315be 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -26,7 +26,8 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
-    2.2.1   : in development
+    2.2.2   : in development
+    2.2.1   : Tagged on April 1, 2006
     2.2.0   : Released on December 1, 2005 as GA.
     2.1.10  : Tagged on November 19, 2005, not released.
     2.1.9   : Released on November 5, 2005 as beta.

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