And we are at 2.2.16-dev

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

diff --git a/CHANGES b/CHANGES
index dbd1eb9bd50e7aeee33fe640e37babd4a4d8f138..4a249eb80148565df5a5279d7e52a47b73c8a168 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
-                                                         -*- coding: utf-8 -*-
+                                                         -*- coding: utf-8 -*-
+Changes with Apache 2.2.16
+
+
+
 Changes with Apache 2.2.15
 
   *) SECURITY: CVE-2009-3555 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index c692c08158efffe4e5aae5da30c504ef94ffb5b2..ecbd12c10fa7e24de4d8ee6be1ad789d499536f1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -10,14 +10,12 @@ Documentation status is maintained separately and can be found at:
   * docs/STATUS in this source tree, or
   * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/STATUS
 
-Consult the following STATUS files for information on related projects:
+The current development branch of this software can be found at:
 
-  * http://svn.apache.org/repos/asf/apr/apr/trunk/STATUS
-  * http://svn.apache.org/repos/asf/apr/apr-util/trunk/STATUS
+  * http://svn.apache.org/repos/asf/httpd/httpd/trunk
 
 Patches considered for backport are noted in their branches' STATUS:
 
-  * http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/STATUS
   * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/STATUS
   * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS
 
@@ -25,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.16  : In maintenance
     2.2.15  : Tagged March 1, 2010
     2.2.14  : Released October 3, 2009.
     2.2.13  : Released August 8, 2009.

diff --git a/include/ap_release.h b/include/ap_release.h
index 528c4d7045947fde523f62b32e796a149787904d..743f051770e0ea5f9b8b8870277842f05d28e60b 100644 (file)
--- 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   15
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   16
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"