You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2015/07/11 06:18:13 UTC

svn commit: r1690342 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS docs/manual/style/version.ent include/ap_release.h

Author: wrowe
Date: Sat Jul 11 04:18:12 2015
New Revision: 1690342

URL: http://svn.apache.org/r1690342
Log:
On to 2.2.31-dev

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/manual/style/version.ent
    httpd/httpd/branches/2.2.x/include/ap_release.h

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1690342&r1=1690341&r2=1690342&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Jul 11 04:18:12 2015
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.31
+
+
+
 Changes with Apache 2.2.30
 
   *) SECURITY: CVE-2015-3183 (cve.mitre.org)

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1690342&r1=1690341&r2=1690342&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Jul 11 04:18:12 2015
@@ -23,6 +23,7 @@ Patches considered for backport are note
 Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
+    2.2.31  : In maintenance
     2.2.30  : Tagged July 10, 2014
     2.2.29  : Released September 3, 2014
     2.2.28  : Tagged August 22, 2014. Not released.

Modified: httpd/httpd/branches/2.2.x/docs/manual/style/version.ent
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/style/version.ent?rev=1690342&r1=1690341&r2=1690342&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/style/version.ent (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/style/version.ent Sat Jul 11 04:18:12 2015
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "30">
+<!ENTITY httpd.patch "31">
 
 <!ENTITY httpd.docs "2.2">

Modified: httpd/httpd/branches/2.2.x/include/ap_release.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_release.h?rev=1690342&r1=1690341&r2=1690342&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_release.h Sat Jul 11 04:18:12 2015
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   30
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   31
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */