And carry on with 2.1.5-dev.

* include/ap_release.h

  Bump AP_SERVER_PATCHLEVEL_NUMBER to 5.
  Set AP_SERVER_DEVBUILD_BOOLEAN.

* CHANGES

  Add a 2.1.5 section.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157726 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index cdfa2b53ea5ca381137002c46ac1c182d0afa578..47c4010ed44b44cc9252ee03033ba9fb7beb9a1c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
-Changes with Apache 2.1.4
+Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
 
+Changes with Apache 2.1.4
+
   *) Add ReceiveBufferSize directive to control the TCP receive buffer.
      [Eric Covener <covener gmail.com>]
 

diff --git a/include/ap_release.h b/include/ap_release.h
index 53b219d1a7f68fad8ef29d54e77c1637575e897c..a9698c122f28ad4183456b79fbac3da37557140e 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -42,8 +42,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 1
-#define AP_SERVER_PATCHLEVEL_NUMBER   4
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   5
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"