From: William A. Rowe Jr Date: Fri, 22 Aug 2014 15:58:38 +0000 (+0000) Subject: And we are at 2.2.30-dev X-Git-Tag: 2.2.30~239 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f6ec48fec5c25c11dd64fe3d8f139415c102df;p=thirdparty%2Fapache%2Fhttpd.git And we are at 2.2.30-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1619851 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 98ba56bbe51..5bae083038f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.2.30 + + + Changes with Apache 2.2.29 *) Corrected docs/manual pages for new MergeTrailers directive and other diff --git a/STATUS b/STATUS index c426a248a53..8d9931f0125 100644 --- a/STATUS +++ b/STATUS @@ -23,6 +23,7 @@ Patches considered for backport are noted in their branches' STATUS: Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] + 2.2.30 : In maintenance 2.2.29 : Tagged August 22, 2014 2.2.28 : Tagged August 22, 2014. Not released. 2.2.27 : Released March 26, 2014 diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index ea12fab1649..05a2faae5a2 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 c329c7df835..98fc652fb86 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 2 -#define AP_SERVER_PATCHLEVEL_NUMBER 29 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 30 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */