Merge non-vetoed bit.

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

diff --git a/STATUS b/STATUS
index 52371c41376686e53d34a8417992dc2f36759489..40613e2a38751fb8a1cd1292677416798460ee5c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -205,11 +205,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) easy proposals:
        - mod_authn_dbm: Return APR_SUCCESS which is equivalent but more readable
          than 'rv' here
-       - mod_md: fix warning with gcc (this breaks maintainer-mode build with
-         recent gcc)
-     trunk patch: http://svn.apache.org/r1850834
-                  http://svn.apache.org/r1850835
-     2.4.x patch: svn merge -c 1850834,1850835 ^/httpd/httpd/trunk .
+     trunk patch: http://svn.apache.org/r1850835
+     2.4.x patch: svn merge -c 1850835 ^/httpd/httpd/trunk .
      +1: jailletc36, jim, ylavic
      -1: wrowe [half vetod; see Message-ID: <CACsi253VZdKPd8L5PMHq+74RX0ttmGbFf8a8d5f0UttEQvsJMQ@mail.gmail.com> for detail] 
      ylavic: I agree w/ joe's response on dev@ for r1850835 (no functional change btw),