And we are at 2.2.21-dev

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

diff --git a/CHANGES b/CHANGES
index 167aeef284c7815f39038092160a323291d22207..ad77029276cbd636061c9de1b63a3a4a0e57cd0b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.21
+
+
 Changes with Apache 2.2.20
 
   *) SECURITY: CVE-2011-3192 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index 63ca38544a789a3119f9d72639ec6ba3d99af1e9..5912811487bf7c6063c81ca9f79279bc0101f3dd 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.21  : In development
     2.2.20  : Tagged August 29, 2011.
     2.2.19  : Tagged May 20, 2011. ABI restored.
     2.2.18  : Released May 11, 2011. ABI broken.

diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 49fd3ae6f9227f9e94f311970687f6e59fd93d89..b7cd6304d0e6b3cfc3d819b6dfeea0354281249f 100644 (file)
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "20">
+<!ENTITY httpd.patch "21">
 
 <!ENTITY httpd.docs "2.2">

diff --git a/include/ap_release.h b/include/ap_release.h
index 98ffabbd2ee8c8078e605aebeb2f960cc1734193..89f2e9561cecbfe3060d6b961c13f91decf6078b 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   20
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   21
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"