]> granicus.if.org Git - apache/commitdiff
And we are 2.4.15-dev
authorJim Jagielski <jim@apache.org>
Thu, 11 Jun 2015 13:59:08 +0000 (13:59 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 11 Jun 2015 13:59:08 +0000 (13:59 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684895 13f79535-47bb-0310-9956-ffa450edef68

CHANGES
STATUS
docs/manual/style/version.ent
include/ap_release.h

diff --git a/CHANGES b/CHANGES
index 74b1bb2f56704bab584f297160b9790412cd9b6f..e9a498add728afc17b2a3e6fc4bdccc0da2efc8e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.15
+
+
 Changes with Apache 2.4.14
 
   *) SECURITY: CVE-2015-3183 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 2dbb45f10b124d9ef952e6e8ebb6c069041ad0b5..60844024c9398ee004246bd0b52208e3d4504c7b 100644 (file)
--- 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.15  : In development.
     2.4.14  : Tagged on June 11, 2015.
     2.4.13  : Tagged on June 4, 2015. Not released.
     2.4.12  : Tagged on January 22, 2015. Released Jan 29, 2015
index 1815b1f2b0063ac4c438a6215946e07deb1ab424..81685056f9fd0cf03be7f60c968549349a6bee3a 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "14">
+<!ENTITY httpd.patch "15">
 
 <!ENTITY httpd.docs "2.4">
index 583fc4a78d236bcd181acd63ba50ec2457d0ea47..d8c63f9a14af03b1802d47481d1538f65d88d10a 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   14
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   15
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */