Commit fcd0ca19 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promote



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837644 13f79535-47bb-0310-9956-ffa450edef68
parent b7179a18
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     +1: jailletc36, ylavic (by inspection), covener
     jailletc36: untested, but looks straight forward enough to vote

   *) Build tweaks: fix make -j install, Fedora config.layout.
      trunk: http://svn.apache.org/r1836469
             http://svn.apache.org/r1836154
      2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk . 
      +1: jorton, covener, jim

PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]
@@ -177,12 +182,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk . 
     +1: jailletc36, jim (via inspection)

   *) Build tweaks: fix make -j install, Fedora config.layout.
      trunk: http://svn.apache.org/r1836469
             http://svn.apache.org/r1836154
      2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk . 
      +1: jorton, covener, jim

   *) Support IPv6-sized client strings in mod_status and mod_echo
      trunk: http://svn.apache.org/r1837225
             http://svn.apache.org/r1837366