promote

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

diff --git a/STATUS b/STATUS
index 3e829a3b1a3e82939409400dbebeeb203e927826..f900b0d9865ad18021699df2c255ce28f5a9cc40 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -128,6 +128,26 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_remoteip: Add sanity checks.
+     trunk patch: http://svn.apache.org/r1864526
+     2.4.x patch: svn merge -c 1864526 ^/httpd/httpd/trunk .
+     +1: jorton, covener, jim
+
+  *) apr_common.m4: Pick up from APR 1.7.0.
+     apr_common.m4 is currently from APR 1.6.x. When running buildconf
+     against APR 1.7.x it gets updated from there. Therefore in the
+     apr_common.m4 in the 2.4.40 tarball differs from the one in svn for 2.4.x
+     (a copy of the APR 1.6.x version in svn, a copy of the APR 1.7.x version
+     in the tarball).
+     The below backports the changes to apr_common.m4 in httpd trunk which
+     in effect result in the 2.4.x apr_common.m4 to become identical with
+     the one in APR 1.7.x (and trunk).
+     trunk patch: http://svn.apache.org/r1856560
+                  http://svn.apache.org/r1856561
+                  http://svn.apache.org/r1856846
+     2.4.x patch: svn merge -c 1856560,1856561,1856846 ^/httpd/httpd/trunk .
+     +1: rjung, jorton, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -150,26 +170,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              reworked, etc.. I would like to avoid a patch that is clearly wrong for some reviewer sitting here for
              months/years without any action item :)
 
-  *) mod_remoteip: Add sanity checks.
-     trunk patch: http://svn.apache.org/r1864526
-     2.4.x patch: svn merge -c 1864526 ^/httpd/httpd/trunk .
-     +1: jorton, covener, jim
-
-  *) apr_common.m4: Pick up from APR 1.7.0.
-     apr_common.m4 is currently from APR 1.6.x. When running buildconf
-     against APR 1.7.x it gets updated from there. Therefore in the
-     apr_common.m4 in the 2.4.40 tarball differs from the one in svn for 2.4.x
-     (a copy of the APR 1.6.x version in svn, a copy of the APR 1.7.x version
-     in the tarball).
-     The below backports the changes to apr_common.m4 in httpd trunk which
-     in effect result in the 2.4.x apr_common.m4 to become identical with
-     the one in APR 1.7.x (and trunk).
-     trunk patch: http://svn.apache.org/r1856560
-                  http://svn.apache.org/r1856561
-                  http://svn.apache.org/r1856846
-     2.4.x patch: svn merge -c 1856560,1856561,1856846 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]