From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 2 Mar 2010 04:55:45 +0000 (+0000)
Subject: Done with 2.2.15, prepared to tag
X-Git-Tag: 2.2.15~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf91ad819b7c95e78d2c1899056ee827c0e92c4b;p=thirdparty%2Fapache%2Fhttpd.git

Done with 2.2.15, prepared to tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917879 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 7534c8b5e9d..c692c08158e 100644
--- a/STATUS
+++ b/STATUS
@@ -25,8 +25,8 @@ Patches considered for backport are noted in their branches' STATUS:
 Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
-    2.2.15  : In development
-    2.2.14  : Tagged September 24, 2009.
+    2.2.15  : Tagged March 1, 2010
+    2.2.14  : Released October 3, 2009.
     2.2.13  : Released August 8, 2009.
     2.2.12  : Released July 28, 2009.
     2.2.11  : Released December 14, 2008.
@@ -168,7 +168,6 @@ PATCHES/ISSUES THAT ARE STALLED
    +1: chrisd
    -0: jim (would prefer to see in 2.4, and to push 2.4 out)
 
-
    * beos MPM: Create pmain pool and run modules' child_init hooks when
      entering ap_mpm_run(), then destroy pmain when exiting ap_mpm_run().
      Otherwise modules' child_init hooks appear to never be executed.
diff --git a/include/ap_release.h b/include/ap_release.h
index d98a0266d93..528c4d70459 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -46,7 +46,7 @@
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
 #define AP_SERVER_PATCHLEVEL_NUMBER   15
-#define AP_SERVER_DEVBUILD_BOOLEAN    1
+#define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"