summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2011-08-01 16:34:13 +0000
committerJim Jagielski <jim@apache.org>2011-08-01 16:34:13 +0000
commit1b63bd2013c46a6197f43bea4207c9295af031b6 (patch)
tree966ed080860c909a1ed0e7dc38b8182d9dbf032f
parent9820c76980f1d92f512be9691fa7e1fd5a0106f3 (diff)
parent3ae9c54dfcd280f88c475b3164d5d3864d594d44 (diff)
downloadhttpd-2.3.14.tar.gz
Tagging trunk1152854 as 2.3.142.3.14
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.3.14@1152858 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--STATUS1
-rw-r--r--docs/manual/style/version.ent2
-rw-r--r--include/ap_release.h4
4 files changed, 3 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 7b0e94695e..2896cb2a94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,5 @@
-*- coding: utf-8 -*-
-Changes with Apache 2.3.15
-
-
Changes with Apache 2.3.14
*) mod_proxy_ajp: Improve trace logging. [Rainer Jung]
diff --git a/STATUS b/STATUS
index 4171a2f1ad..9eeb61aa84 100644
--- a/STATUS
+++ b/STATUS
@@ -26,7 +26,6 @@ Release history:
[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
while x.{even}.z versions are Stable/GA releases.]
- 2.3.15 : In development.
2.3.14 : Tagged on August 1, 2011.
2.3.13 : Tagged on June 28, 2011, not released.
2.3.12 : Tagged on May 11, 2011. Released May 23, 2011.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e3965207da..43e507338c 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
<!ENTITY httpd.major "2">
<!ENTITY httpd.minor "3">
-<!ENTITY httpd.patch "15">
+<!ENTITY httpd.patch "14">
<!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index 6bd2e227c9..3c08091c8d 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 3
-#define AP_SERVER_PATCHLEVEL_NUMBER 15
-#define AP_SERVER_DEVBUILD_BOOLEAN 1
+#define AP_SERVER_PATCHLEVEL_NUMBER 14
+#define AP_SERVER_DEVBUILD_BOOLEAN 0
#if AP_SERVER_DEVBUILD_BOOLEAN
#define AP_SERVER_ADD_STRING "-dev"