]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
And we are at 2.2.30-dev
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 22 Aug 2014 15:58:38 +0000 (15:58 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 22 Aug 2014 15:58:38 +0000 (15:58 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1619851 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index 98ba56bbe5166345a8ac359dda6899bdb808f4a1..5bae083038f328ffdf2652c261ee3abf7a874ae8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.30
+
+
+
 Changes with Apache 2.2.29
 
   *) Corrected docs/manual pages for new MergeTrailers directive and other
diff --git a/STATUS b/STATUS
index c426a248a53ab3cb938bd807c405be63eb70d1b4..8d9931f0125ccdb9fcba34c684df2930e713107f 100644 (file)
--- 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.30  : In maintenance
     2.2.29  : Tagged August 22, 2014
     2.2.28  : Tagged August 22, 2014. Not released.
     2.2.27  : Released March 26, 2014
index ea12fab1649567048bffa0d185deed68ce3ee676..05a2faae5a2085ae3fac2ac425e88d823fd6e3f6 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "29">
+<!ENTITY httpd.patch "30">
 
 <!ENTITY httpd.docs "2.2">
index c329c7df8352e7848dc9abb4b7c1f7e5aadcdd67..98fc652fb8694b6c7a7c0f339b21ddfb2931d798 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   29
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   30
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */