From 88d2ee440d9daf6461f01e8866740a6e0598fe3d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 10 Jul 2018 13:48:27 +0000 Subject: [PATCH] Post 2.4.34 tag updates git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835553 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ STATUS | 3 ++- docs/manual/style/version.ent | 2 +- include/ap_release.h | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index d207a50849..6e250dd87a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.35 + Changes with Apache 2.4.34 *) Introduce zh-cn and zh-tw (simplified and traditional Chinese) error diff --git a/STATUS b/STATUS index 8a02863302..1127290c85 100644 --- a/STATUS +++ b/STATUS @@ -29,7 +29,8 @@ Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] - 2.4.34 : In development. Jim proposes T&R ~ July 4 and offers + 2.4.35 : In development + 2.4.34 : Tagged on July 10, 2018 to RM. 2.4.33 : Tagged on March 17, 2018. Released on March 21, 2018. 2.4.32 : Tagged on March 09, 2018. Distributed on March 15, 2018, diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 786d47002e..25313dff9d 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 27efffdc64..adcc6513c4 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 34 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 35 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */ -- 2.40.0