* Promote [skip ci]

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

diff --git a/STATUS b/STATUS
index 32b8243c6e7b01b0a089020bf83b6f548efbcda3..51db84537dda7de8e790eab135823abeb2694aca 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -154,6 +154,36 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/wstunnel-decline.diff
      +1 covener, jim, rpluem
 
+ *) Tooling: Add a new way to document changes
+   Trunk version of patch:
+      http://svn.apache.org/r1879822
+      http://svn.apache.org/r1879831
+      http://svn.apache.org/r1879840
+   Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1879822,1879831,1879840 ^/httpd/httpd/trunk .
+   +1: rpluem, jim, jorton
+
+  *) Slightly speed-up the execution of the test framework.
+     Trunk version of patch:
+        https://svn.apache.org/r1880500
+        https://svn.apache.org/r1880501
+        https://svn.apache.org/r1880509
+    Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1880500,1880501,1880509 ^/httpd/httpd/trunk .
+     +1: jailletc36, rpluem, jorton
+
+  *) event, worker: avoid UBSan exception calling memcpy(,NULL,0) at startup.
+     Trunk version of patch:
+        https://svn.apache.org/r1874011
+        https://svn.apache.org/r1874055
+        https://svn.apache.org/r1874062
+    Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1874011,1874055,1874062 ^/httpd/httpd/trunk .
+     +1: jailletc36, rpluem, jorton
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -207,16 +237,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
     +1: minfrin
 
- *) Tooling: Add a new way to document changes
-   Trunk version of patch:
-      http://svn.apache.org/r1879822
-      http://svn.apache.org/r1879831
-      http://svn.apache.org/r1879840
-   Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1879822,1879831,1879840 ^/httpd/httpd/trunk .
-   +1: rpluem, jim, jorton
-
   *)  mpm_event: reset listener_is_wakeable on reload.
      trunk patch: http://svn.apache.org/r1877552
      2.4.x patch: svn merge -c 1877552 ^/httpd/httpd/trunk .
@@ -232,16 +252,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1873762,1881263 ^/httpd/httpd/trunk .
      +1: rpluem, gbechis
 
-  *) Slightly speed-up the execution of the test framework.
-     Trunk version of patch:
-        https://svn.apache.org/r1880500
-        https://svn.apache.org/r1880501
-        https://svn.apache.org/r1880509
-    Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1880500,1880501,1880509 ^/httpd/httpd/trunk .
-     +1: jailletc36, rpluem, jorton
-
   *) Fix some Windows 64 compilation warnings (if I get positive feedbacks
      on such patches, I'll try to group more changes in future commits. However
      fixing these warnings looks like a long and boring task)
@@ -255,16 +265,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1881303,1881304,1881305,1881306 ^/httpd/httpd/trunk .
      +1: jailletc36,
 
-  *) event, worker: avoid UBSan exception calling memcpy(,NULL,0) at startup.
-     Trunk version of patch:
-        https://svn.apache.org/r1874011
-        https://svn.apache.org/r1874055
-        https://svn.apache.org/r1874062
-    Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1874011,1874055,1874062 ^/httpd/httpd/trunk .
-     +1: jailletc36, rpluem, jorton
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]