merge r265737 from trunk.

Author: trawick
Reviewed by: colm

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

diff --git a/CHANGES b/CHANGES
index dea0db1dd376a1510416ceb1d530e46ba122afb1..1d58e216f1d6acde0257411184073a1af01144d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
-     in 1.3.  [Jeff Trawick]
-
   *) mod_log_config: %{hextid}P will log the thread id in hex with APR
      versions 1.2.0 or higher.  [Jeff Trawick]
 
@@ -18,6 +15,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.9
 
+  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
+     in 1.3.  [Jeff Trawick]
+
   *) Support dbd connections tied to the conn_rec [Nick Kew]
 
   *) Move mod_dbd to /modules/database/ [Nick Kew]