And on to 2.2.29 maintenance

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

diff --git a/CHANGES b/CHANGES
index ca221ad8de6e63e4bb63741bf481802fa185b6c8..9049e8cfd5943165bcd378bdfebbc189e5347438 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.29
+
+
+
 Changes with Apache 2.2.28
 
   *) SECURITY: CVE-2014-0118 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index 078b086a3ce375ee49a52ac30addcb2758961f6a..a7a56ec82caa24ba26e2c68260132153cbb9a33f 100644 (file)
--- 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.29  : In maintenance
     2.2.28  : Tagged August 22, 2014
     2.2.27  : Released March 26, 2014
     2.2.26  : Released November 18, 2013

diff --git a/include/ap_release.h b/include/ap_release.h
index 232f1af288393bd16a46f93860396259b61f2e00..a633cb3c7fe0834fdc995b5309968c249545b8ae 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   28
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   29
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */