From: Jim Jagielski <jim@apache.org>
Date: Mon, 13 Dec 2010 15:44:55 +0000 (+0000)
Subject: And roll on 2.3.11...
X-Git-Tag: 2.3.11~378
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4638eaa5da7c8a95acb5d6e9c6a9c7f64b3a9474;p=apache

And roll on 2.3.11...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1045185 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4bccbf770f..5c9b7ecb92 100644
--- 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 b078c3b297..5625f78f58 100644
--- 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.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e10b426557..b2558e644b 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "3">
-<!ENTITY httpd.patch "10">
+<!ENTITY httpd.patch "11">
 
 <!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index 05935f7d9a..8c826bde3a 100644
--- 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 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"