From: Jim Jagielski <jim@apache.org>
Date: Tue, 23 Nov 2010 14:43:27 +0000 (+0000)
Subject: Roll on .10
X-Git-Tag: 2.3.10~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cabf0280ee1fecb7d2378ccab3541aa0a9c47cb0;p=thirdparty%2Fapache%2Fhttpd.git

Roll on .10


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

diff --git a/CHANGES b/CHANGES
index 23cc7175459..14832efa23a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.10
+
+
 Changes with Apache 2.3.9
 
   *) SECURITY: CVE-2010-1623 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index c6828ea7cd3..e6253707b82 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.10  : In development.
     2.3.9   : Tagged on November 23, 2010.
     2.3.8   : Tagged on August 24, 2010.
     2.3.7   : Tagged on August 19, 2010, not released.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 01727e1b40e..e10b426557d 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 "9">
+<!ENTITY httpd.patch "10">
 
 <!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index a96c2c4fbf4..df0f340536d 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   9
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   10
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"