From: Paul Querna <pquerna@apache.org>
Date: Tue, 29 Nov 2005 01:56:19 +0000 (+0000)
Subject: Roll on to 2.2.1-dev
X-Git-Tag: 2.2.0^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34f94946241ba0af559e5d4522126cb20a6cd86e;p=thirdparty%2Fapache%2Fhttpd.git

Roll on to 2.2.1-dev


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

diff --git a/STATUS b/STATUS
index 4b622aa6c9b..79958ecc4bf 100644
--- a/STATUS
+++ b/STATUS
@@ -24,8 +24,9 @@ Patches considered for backport are noted in their branches' STATUS:
 Release history:
     [NOTE that only Alpha/Beta releases occur in 2.1 development]
 
-    2.1.11  : in development
-    2.1.10  : Tagged on November 19, 2005.
+    2.2.1   : in development
+    2.2.0   : Released on ?, ? 2005.
+    2.1.10  : Tagged on November 19, 2005, voted to 2.2.0.
     2.1.9   : Released on November 5, 2005 as beta.
     2.1.8   : Released on October 1, 2005 as beta.
     2.1.7   : Released on September 12, 2005 as beta.
diff --git a/include/ap_release.h b/include/ap_release.h
index 2aaf907872f..a5bf7b72b60 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -46,8 +46,8 @@
 #define AP_SERVER_BASEPRODUCT "Apache"
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
-#define AP_SERVER_MINORVERSION_NUMBER 1
-#define AP_SERVER_PATCHLEVEL_NUMBER   11
+#define AP_SERVER_MINORVERSION_NUMBER 2
+#define AP_SERVER_PATCHLEVEL_NUMBER   1
 #define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN