From: Jim Jagielski Date: Mon, 21 Mar 2016 17:19:09 +0000 (+0000) Subject: and we are now 2.4.20-dev X-Git-Tag: 2.4.20~46 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a736fd377945cac4de31934aa4678b85225a6195;p=apache and we are now 2.4.20-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736069 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index fe9db09017..5df762e3b5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.20 + + Changes with Apache 2.4.19 *) mod_include: Add variable DOCUMENT_ARGS, with the arguments to the diff --git a/STATUS b/STATUS index 34e938e3fb..4b28da8995 100644 --- a/STATUS +++ b/STATUS @@ -34,6 +34,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.20 : In development. 2.4.19 : Tagged on March 21, 2015. 2.4.18 : Tagged on December 8, 2015. Released on December 14, 2015. 2.4.17 : Tagged on October 9, 2015. Released October 13, 2015. diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index f63a1cbe39..e549cb7d4a 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 b68043c7ef..c782732601 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 19 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 20 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */