From 7d6fb3b5830121bcb8a2d5d84c0a78500d840991 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 15 Jan 2015 19:57:52 +0000 Subject: [PATCH] and we are 2.4.12-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1652260 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 368fc74f5c..750613355b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.12 + + Changes with Apache 2.4.11 *) SECURITY: CVE-2014-3583 (cve.mitre.org) diff --git a/STATUS b/STATUS index 9402bb78ef..575333e33f 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.12 : In development. 2.4.11 : Tagged on January 15, 2015. 2.4.10 : Tagged on July 15, 2014. Released July 21, 2014 2.4.9 : Tagged on March 13, 2014. Released on March 17, 2014 diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 3a4e24e825..592305c2e3 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 afec998b22..5f4aa8d4db 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 11 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 12 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */ -- 2.40.0