And roll onto 2.3.12

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

diff --git a/CHANGES b/CHANGES
index 0d5c6a997c45739fa1f43f6b6e2b73bb6e6f3d08..b09f698e9746f80832ced6407585c745a27eb378 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.12
+
+
 Changes with Apache 2.3.11
 
   *) mod_proxy: balancer-manager now uses POST instead of GET.

diff --git a/STATUS b/STATUS
index d3a300afa7ac3b31173fa5bd3935a352ebade9dc..83ce487a3ccc424f556c9e14bd757ee9456951e2 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.12  : In development.
     2.3.11  : Tagged on March 1, 2011 (beta).
     2.3.10  : Tagged on December 13, 2010. Released Dec 21, 2010.
     2.3.9   : Tagged on November 23, 2010, not released.

diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index b2558e644bc6946c7cd9cd3ca22cb9607b9602a7..83d44575b56b8ce37e96f1218a0e0d2f72d6a3a1 100644 (file)
--- 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 "11">
+<!ENTITY httpd.patch "12">
 
 <!ENTITY httpd.docs "trunk">

diff --git a/include/ap_release.h b/include/ap_release.h
index 53598666d5ccb7dce5fd3d5ad69a5517fd62bc52..8bdb6531de588cd89f494470fc6a75fdc91ebf1c 100644 (file)
--- 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   11
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   12
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"