From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 21 Aug 2012 18:19:09 +0000 (+0000)
Subject: On to 2.2.24-dev
X-Git-Tag: 2.2.24~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86fddd0f1cca1493f1df1566a8df2a9a7e5f162a;p=thirdparty%2Fapache%2Fhttpd.git

On to 2.2.24-dev

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

diff --git a/CHANGES b/CHANGES
index d4117267507..0c97d60f003 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.24
+
+
+
 Changes with Apache 2.2.23
 
   *) SECURITY: CVE-2012-0883 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 06d94d54ad7..5906f8367d4 100644
--- a/STATUS
+++ b/STATUS
@@ -23,6 +23,7 @@ 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.24  : In maintenance
     2.2.23  : Tagged August 21, 2012
     2.2.22  : Released January 31, 2012.
     2.2.21  : Released September 13, 2011.
diff --git a/include/ap_release.h b/include/ap_release.h
index 3328cf0e679..f6f3c0d1947 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 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   23
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   24
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */