promote

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

diff --git a/STATUS b/STATUS
index 77c1cfad33b6e413afd4620aa7db2b9161e1659c..d2f56d676c24ffc0626d6c02119285fba23222e6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -125,6 +125,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x: svn merge -c 1811744 ^/httpd/httpd/trunk .
      +1: elukey, icing, ylavic
 
+  *) mod_macro: fix usability of globally defined macros in .htaccess files.
+                PR 57525.
+     trunk patch: http://svn.apache.org/r1813643
+     2.4.x patch: trunk works (modulo CHANGES)
+                  svn merge -c 1813643 ^/httpd/httpd/trunk .
+     +1: ylavic, icing, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -219,13 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              Note that r1812339 could be backported in any case, even if
              the above configure.in proposal does not get accepted.
 
-  *) mod_macro: fix usability of globally defined macros in .htaccess files.
-                PR 57525.
-     trunk patch: http://svn.apache.org/r1813643
-     2.4.x patch: trunk works (modulo CHANGES)
-                  svn merge -c 1813643 ^/httpd/httpd/trunk .
-     +1: ylavic, icing, jim
-
   *) mpm_event: avoid a very unlikely race condition between the listener and
      the workers when the latter fails to add a connection to the pollset.
      trunk patch: http://svn.apache.org/r1809273