From: Jim Jagielski <jim@apache.org>
Date: Thu, 16 Jun 2016 16:56:47 +0000 (+0000)
Subject: And we are 2.4.22-dev
X-Git-Tag: 2.4.22~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78d7e3fa7dd9e89f8bc5c5d3cef517f6d69601f;p=thirdparty%2Fapache%2Fhttpd.git

And we are 2.4.22-dev


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

diff --git a/CHANGES b/CHANGES
index 5678bd8be68..17ee005c4a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.22
+
 Changes with Apache 2.4.21
 
   *) mod_http2: more rigid error handling in DATA frame assembly, leading
diff --git a/STATUS b/STATUS
index b7e48bc0d18..f4a0b032bba 100644
--- 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.22  : In development.
     2.4.21  : Tagged on June 16, 2016.
     2.4.20  : Tagged on April 4, 2016. Released on April 11, 2016.
     2.4.19  : Tagged on March 21, 2016, not released.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 90f5fc49a64..cac228d3cbd 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "21">
+<!ENTITY httpd.patch "22">
 
 <!ENTITY httpd.docs "2.4">
diff --git a/include/ap_release.h b/include/ap_release.h
index 4f677c0ab75..afd66d16b00 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 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   21
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   22
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */