From: Jim Jagielski Date: Mon, 15 Jul 2013 16:42:58 +0000 (+0000) Subject: and we are at 2.4.7-dev X-Git-Tag: 2.4.7~371 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=334bcb74efd489c2b74d91b1f2eb55c956465b44;p=apache and we are at 2.4.7-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1503325 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 19e600fe9f..822ca4b476 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.7 + + Changes with Apache 2.4.6 *) Revert a broken fix for PR54948 that was applied to 2.4.5 (which was diff --git a/STATUS b/STATUS index 312c0a75e3..5d0592a80a 100644 --- a/STATUS +++ b/STATUS @@ -32,6 +32,7 @@ Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] + 2.4.7 : In development. 2.4.6 : Tagged on July 15, 2013. 2.4.5 : Tagged on July 11, 2013, not released. 2.4.4 : Tagged on February 18, 2013. Released Feb 25, 2013 diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 63425133a4..6796aaf104 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 0d54fa6f5b..b23ba06cad 100644 --- 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 4 -#define AP_SERVER_PATCHLEVEL_NUMBER 6 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 7 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */