From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 11 Jul 2015 04:18:12 +0000 (+0000)
Subject: On to 2.2.31-dev
X-Git-Tag: 2.2.31~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b88fb5436b993e67a104a1a39005cad1d823ec3;p=thirdparty%2Fapache%2Fhttpd.git

On to 2.2.31-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690342 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e2bc6019a8f..b031602d4eb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/STATUS b/STATUS
index 4cccbde65ba..add7f1f1d0a 100644
--- 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.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.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 05a2faae5a2..4581a255140 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -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">
diff --git a/include/ap_release.h b/include/ap_release.h
index 2f15bd5575d..67099c8ab66 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -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 */