From: Paul Querna <pquerna@apache.org>
Date: Sun, 20 Nov 2005 00:44:09 +0000 (+0000)
Subject: Roll on to 2.1.10-dev.
X-Git-Tag: 2.2.0^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59feb511f67931a680cf6b7ee86d20d6643b39c5;p=thirdparty%2Fapache%2Fhttpd.git

Roll on to 2.1.10-dev.


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

diff --git a/CHANGES b/CHANGES
index b4e14a8eff6..b27b14cb211 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
                                                         -*- coding: utf-8 -*-
+Changes with Apache 2.1.11
+
+
 Changes with Apache 2.1.10
 
   *) mod_negotiation: Minor performance tweak by reusing already calculated
diff --git a/STATUS b/STATUS
index 398f4882412..4b622aa6c9b 100644
--- a/STATUS
+++ b/STATUS
@@ -24,7 +24,8 @@ 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.10  : in development
+    2.1.11  : in development
+    2.1.10  : Tagged on November 19, 2005.
     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 3b963607d1c..2aaf907872f 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -47,8 +47,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 1
-#define AP_SERVER_PATCHLEVEL_NUMBER   10
-/* #define AP_SERVER_DEVBUILD_BOOLEAN    1 */
+#define AP_SERVER_PATCHLEVEL_NUMBER   11
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"