From: Jim Jagielski <jim@apache.org>
Date: Mon, 1 Aug 2011 16:24:16 +0000 (+0000)
Subject: And we are at 2.3.15-dev
X-Git-Tag: 2.3.14~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db7bd57c24d8cb85946c9b35ca7adf97ba2fbb04;p=thirdparty%2Fapache%2Fhttpd.git

And we are at 2.3.15-dev

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

diff --git a/CHANGES b/CHANGES
index 2896cb2a948..7b0e94695e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.15
+
+
 Changes with Apache 2.3.14
 
   *) mod_proxy_ajp: Improve trace logging.  [Rainer Jung]
diff --git a/STATUS b/STATUS
index 9eeb61aa847..4171a2f1adb 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.15  : In development.
     2.3.14  : Tagged on August 1, 2011.
     2.3.13  : Tagged on June 28, 2011, not released.
     2.3.12  : Tagged on May 11, 2011. Released May 23, 2011.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 43e507338c1..e3965207da9 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 "14">
+<!ENTITY httpd.patch "15">
 
 <!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index 3c08091c8d2..6bd2e227c94 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   14
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   15
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"