From 1ee23b1eaaa28a07fbc33b84ab88cbc6ff73d6a4 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 30 Aug 2011 00:11:53 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ STATUS | 1 + docs/manual/style/version.ent | 2 +- include/ap_release.h | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 167aeef284c..ad77029276c 100644 --- 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 63ca38544a7..5912811487b 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.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 49fd3ae6f92..b7cd6304d0e 100644 --- a/docs/manual/style/version.ent +++ b/docs/manual/style/version.ent @@ -19,6 +19,6 @@ - + diff --git a/include/ap_release.h b/include/ap_release.h index 98ffabbd2ee..89f2e9561ce 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 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" -- 2.47.2