]> granicus.if.org Git - apache/commitdiff
And roll on 2.3.11...
authorJim Jagielski <jim@apache.org>
Mon, 13 Dec 2010 15:44:55 +0000 (15:44 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 13 Dec 2010 15:44:55 +0000 (15:44 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1045185 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index 4bccbf770f164c2cddde1b617d6219af1e1b82b2..5c9b7ecb920cc82319141708e7f0fbea3ca616da 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.11
+
+
 Changes with Apache 2.3.10
 
   *) mod_rewrite: Don't implicitly URL-escape the original query string
diff --git a/STATUS b/STATUS
index b078c3b2973f92210efc9c0d45b37c7c2a92d76b..5625f78f58441e01b6a7a59bb3d3fa159fa7769f 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.3.11  : In development.
     2.3.10  : Tagged on December 13, 2010.
     2.3.9   : Tagged on November 23, 2010, not released.
     2.3.8   : Tagged on August 24, 2010.
index e10b426557d8b188fee680f4dedaa7e6332eec73..b2558e644bc6946c7cd9cd3ca22cb9607b9602a7 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "3">
-<!ENTITY httpd.patch "10">
+<!ENTITY httpd.patch "11">
 
 <!ENTITY httpd.docs "trunk">
index 05935f7d9a89bd0bd59db52d2c984570f10ac13f..8c826bde3ae82d81aa3d61bf93a7fc9330f41e83 100644 (file)
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 3
-#define AP_SERVER_PATCHLEVEL_NUMBER   10
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   11
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"