promote

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

diff --git a/STATUS b/STATUS
index 844b579bafcb29ffc76d7a6906ae2db595d9f99d..7adf7ab3a175d0c6fb94726e904e8f3184aff72c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) scoreboard/status: Keep previous worker connection/request data when idle as
+     prior to 2.4.20.
+     trunk patch: http://svn.apache.org/r1739008
+     trunk patch: http://svn.apache.org/r1739146
+     trunk patch: http://svn.apache.org/r1739151
+     trunk patch: http://svn.apache.org/r1739193
+     2.4.x patch: trunk works (modulo CHANGES) or
+                  http://home.apache.org/~ylavic/patches/httpd-2.4.x-scoreboard_preserve-v2.patch
+     +1: ylavic, rpluem, jim
+     ylavic: diff with 2.4.18 after this merge:
+             http://home.apache.org/~ylavic/patches/scoreboard-2.4.18.diff
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -191,17 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) scoreboard/status: Keep previous worker connection/request data when idle as
-     prior to 2.4.20.
-     trunk patch: http://svn.apache.org/r1739008
-     trunk patch: http://svn.apache.org/r1739146
-     trunk patch: http://svn.apache.org/r1739151
-     trunk patch: http://svn.apache.org/r1739193
-     2.4.x patch: trunk works (modulo CHANGES) or
-                  http://home.apache.org/~ylavic/patches/httpd-2.4.x-scoreboard_preserve-v2.patch
-     +1: ylavic, rpluem, jim
-     ylavic: diff with 2.4.18 after this merge:
-             http://home.apache.org/~ylavic/patches/scoreboard-2.4.18.diff
 
   
 PATCHES/ISSUES THAT ARE BEING WORKED