]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
and we are 2.4.14-dev
authorJim Jagielski <jim@apache.org>
Thu, 4 Jun 2015 16:15:38 +0000 (16:15 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 4 Jun 2015 16:15:38 +0000 (16:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683585 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index 517a9299ae91440fb032e8980647c1949c094247..5b31673b62c98ff72b4ec6c9403405a9a33146f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.14
+
+
 Changes with Apache 2.4.13
 
   *) SECURITY: CVE-2015-0253 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 6b6de0f06dce7be1ce29d8c8ae41ebdfb83bf443..585f722621710eb4b1ae92ebe6ce785aeef941f5 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.14  : In development.
     2.4.13  : Tagged on June 4, 2015.
     2.4.12  : Tagged on January 22, 2015. Released Jan 29, 2015
     2.4.11  : Tagged on January 15, 2015. Not released.
index c42bef9554913876d86f342e1cba55fe254eb5ac..1815b1f2b0063ac4c438a6215946e07deb1ab424 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "13">
+<!ENTITY httpd.patch "14">
 
 <!ENTITY httpd.docs "2.4">
index 5eff4159349f666fa80f77280f18feb8d29ea64a..57e9a0cfd5a099e76834f021f9a540bcd54a568b 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   13
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   14
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */