You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2019/01/17 13:15:46 UTC

svn commit: r1851527 - /httpd/httpd/branches/2.4.x/STATUS

Author: jorton
Date: Thu Jan 17 13:15:46 2019
New Revision: 1851527

URL: http://svn.apache.org/viewvc?rev=1851527&view=rev
Log:
Merge non-vetoed bit.

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1851527&r1=1851526&r2=1851527&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jan 17 13:15:46 2019
@@ -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: <CA...@mail.gmail.com> for detail] 
      ylavic: I agree w/ joe's response on dev@ for r1850835 (no functional change btw),