summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2011-11-08 23:07:29 +0000
committerJim Jagielski <jim@apache.org>2011-11-08 23:07:29 +0000
commit7ce4868e402eaa7da916b4febc82cd1dc23be261 (patch)
treef81d9e96d18d36738f6d9aa4c2171f29353c78a1
parent4cab24c02a3053f91f9cb6c6a13bcc2a662b7ac5 (diff)
downloadhttpd-7ce4868e402eaa7da916b4febc82cd1dc23be261.tar.gz
And we are at 2.3.16-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199519 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, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 4063989746..72bbddb186 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-*- coding: utf-8 -*-
+Changes with Apache 2.3.16
+
+
Changes with Apache 2.3.15
*) SECURITY: CVE-2011-3348 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 302cb01524..62476842d0 100644
--- a/STATUS
+++ b/STATUS
@@ -26,6 +26,7 @@ Release history:
[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
while x.{even}.z versions are Stable/GA releases.]
+ 2.3.16 : In Development.
2.3.15 : Tagged on November 8, 2011.
2.3.14 : Tagged on August 1, 2011. Released Aug. 9, 2011.
2.3.13 : Tagged on June 28, 2011, not released.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e3965207da..eaf3701789 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 "16">
<!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index ad49511114..e267443f01 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 0
+#define AP_SERVER_PATCHLEVEL_NUMBER 16
+#define AP_SERVER_DEVBUILD_BOOLEAN 1
/* Synchronize the above with docs/manual/style/version.ent */