* Vote

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

diff --git a/STATUS b/STATUS
index 1abd0e17976d755d95b6da80ea3885c305e85245..f28d48389f9152059deeb06ff87aea1c3bd3e0af 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -189,7 +189,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      no shared memory slotmem was initialized.
      trunk patch: https://svn.apache.org/r1899809
      2.4.x patch: svn merge -c 1899809 ^/httpd/httpd/trunk .
-     +1: rjung
+     +1: rjung, rpluem
+     rpluem says: Has a conflict in CHANGES. Please put each change entry
+     in a separate file below changes-entries. See README.CHANGES.
 
   *) mod_proxy: Set a status code of 502 in case the backend just closed the
      connection in reply to our forwarded request.