From: William A. Rowe Jr Date: Wed, 15 Jul 2015 16:22:51 +0000 (+0000) Subject: And we are at .32-dev X-Git-Tag: 2.2.32~216 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cb136cb6f1f0a2691498f1f94dc98c30cd014d8;p=thirdparty%2Fapache%2Fhttpd.git And we are at .32-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691247 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 2c92d4c79be..bd8b050ffe2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.2.32 + + + Changes with Apache 2.2.31 *) Correct win32 build issues for mod_proxy exports, OpenSSL 1.0.x headers. diff --git a/STATUS b/STATUS index 02a7e67d772..8eef8a55237 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.32 : In maintenance 2.2.31 : Tagged July 15, 2015 2.2.30 : Tagged July 10, 2015. Not released. 2.2.29 : Released September 3, 2014 diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 4581a255140..1d538fecc53 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 5fa3173f87c..c219f508361 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 31 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 32 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */