From: Jim Jagielski Date: Fri, 10 Aug 2007 20:18:00 +0000 (+0000) Subject: And bump after tag X-Git-Tag: 2.2.6~163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=889a4ee3571ac8a3c751ef01c741cd73f56d2475;p=thirdparty%2Fapache%2Fhttpd.git And bump after tag git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@564747 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 8bf0742c804..bd178f3a240 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ -*- coding: utf-8 -*- +Changes with Apache 2.2.6 + + Changes with Apache 2.2.5 *) SECURITY: CVE-2007-3847 (cve.mitre.org) diff --git a/STATUS b/STATUS index cef3e17e45e..b4c93ef65dd 100644 --- a/STATUS +++ b/STATUS @@ -26,6 +26,7 @@ Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] + 2.2.6 : In development 2.2.5 : Tagged August 10, 2007 2.2.4 : Released on January 9, 2007 as GA. 2.2.3 : Released on July 28, 2006 as GA. diff --git a/include/ap_release.h b/include/ap_release.h index a74a641df63..f55e23a28af 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 5 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 6 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 #if AP_SERVER_DEVBUILD_BOOLEAN #define AP_SERVER_ADD_STRING "-dev"