]> granicus.if.org Git - apache/commitdiff
With these changes, looks like we have enuff votes
authorJim Jagielski <jim@apache.org>
Fri, 12 Jan 2018 13:56:58 +0000 (13:56 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 12 Jan 2018 13:56:58 +0000 (13:56 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1820983 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 3028f9439e68c626fbdf1754a1819463544fa9c5..8fd3e8f93483a6f2061abb8a19663be9db199b96 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -209,10 +209,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1599012
                   http://svn.apache.org/r1601559
                   http://svn.apache.org/r1818624   (style only)
-     2.4.x patch: svn merge -c r1599012,r1601559,r1818624 ^/httpd/httpd/trunk .
-     +1: niq, jim
-     ylavic: +1 with r1819969 and r1819970, see dev@ thread re r1599012.
-     icing: what ylavic said
+                  http://svn.apache.org/r1819969
+                  http://svn.apache.org/r1819970
+     2.4.x patch: svn merge -c r1599012,r1601559,r1818624, r1819969, r1819970 ^/httpd/httpd/trunk .
+     +1: niq, jim, ylavic, icing
 
   *) mpm_event: Update scoreboard status for KeepAlive state, plus avoid a
                 small sbh memory leak.