Update proposal (resetting jfclere's vote), promote r1878092. [skip ci]

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

diff --git a/STATUS b/STATUS
index 308824b37a42ac4e21b8653e97f80dd04185bbb4..a5ba3844d941a9df19e85bc5f5936dc869ae743b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -150,6 +150,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/264.diff
      +1: rpluem, ylavic, jorton
 
+  *) core: scoreboard.c method check
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1878092
+     2.4.x patch: svn merge -c 1878092  ^/httpd/httpd/trunk .
+     +1: covener, ylavic, jfclere
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -218,15 +223,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1893016 ^/httpd/httpd/trunk .
      +1: ylavic,
 
-  *) core: scoreboard.c method check
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1878092
-     2.4.x patch: svn merge -c 1878092  ^/httpd/httpd/trunk .
-     +1: covener, ylavic, jfclere
-
   *) core: Initialize the request fields on read failure to avoid NULLs.
      trunk patch: http://svn.apache.org/r1893030
-     2.4.x patch: svn merge -c 1893030  ^/httpd/httpd/trunk .
-     +1: ylavic, jfclere
+                  http://svn.apache.org/r1893044
+     2.4.x patch: svn merge -c 1893030,1893044 ^/httpd/httpd/trunk .
+     +1: ylavic,
+     ylavic: still being discussed on dev@
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]