Merged x1.

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

diff --git a/STATUS b/STATUS
index a0f12251c543f0727ba5ee118a3cadcac997f8d5..5eb805042059fbd957153238f4ae7ce2f2377637 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -167,13 +167,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: ivan
      +0: jorton - falls under RTC exception for "non-Unix build"
 
-  *) core: In set_override(), check the return value of set_allow_opts().
-           Github #310
-     trunk patch: https://svn.apache.org/r1917017
-                  https://svn.apache.org/r1923218
-     2.4.x patch: svn merge -c 1917017,1923218 ^/httpd/httpd/trunk .
-     +1: rjung (reduce code drift), jorton, jailletc36
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]