Onward to 2.1.2-dev.

* CHANGES: Bump...
* include/ap_release.h: to 2.1.2-dev.

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

diff --git a/CHANGES b/CHANGES
index 565c3894196cfc61ec8da211ff7ff83c2fe9a50b..37d5b2d1b8b69eb0445107b129b84e7d8e2b22f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
-Changes with Apache 2.1.0-dev
+Changes with Apache 2.1.2-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+Changes with Apache 2.1.1
+
   *) mod_proxy_http: Stream content better - always flush buffered data to
      the client before blocking waiting for new data.  PR 19954.
      [Joe Orton]

diff --git a/include/ap_release.h b/include/ap_release.h
index b6d7da1311df27441304817082429a63be88c61f..e64556ffeb991699c08dc579905d111067386b78 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -35,8 +35,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 1
-#define AP_SERVER_PATCHLEVEL_NUMBER   1 
-/* #define AP_SERVER_ADD_STRING          "-dev" */
+#define AP_SERVER_PATCHLEVEL_NUMBER   2
+#define AP_SERVER_ADD_STRING          "-dev"
 
 /* keep old macros as well */
 #define AP_SERVER_MAJORVERSION APR_STRINGIFY(AP_SERVER_MAJORVERSION_NUMBER)