]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
promote
authorJim Jagielski <jim@apache.org>
Thu, 13 Jun 2019 11:06:29 +0000 (11:06 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 13 Jun 2019 11:06:29 +0000 (11:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1861246 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 3199c2f8844b2821963c2c57f5de3f193d5d347a..8db2e26ed92b376ebdd973c2fabdbf2b003aeb58 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -127,6 +127,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: make the eor bucket do the right thing when copied
+     trunk patch: http://svn.apache.org/r1707084
+                  http://svn.apache.org/r1707093
+                  http://svn.apache.org/r1707159
+                  http://svn.apache.org/r1707362
+     2.4.x patch: svn merge -c 1707084,1707093,1707159,1707362 ^/httpd/httpd/trunk .
+     +1: icing, covener, jim
+
+  *) mod_http2:  more copying of data to disentangle worker processing from main connection
+     trunk patch: http://svn.apache.org/r1860260
+     2.4.x patch: svn merge -c 1860260 ^/httpd/httpd/trunk .
+     +1: icing, covener, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -177,19 +189,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: at least, r1853302 is required, IMHO
      minfrin: r1853302 is added in above, jim agrees
 
-  *) core: make the eor bucket do the right thing when copied
-     trunk patch: http://svn.apache.org/r1707084
-                  http://svn.apache.org/r1707093
-                  http://svn.apache.org/r1707159
-                  http://svn.apache.org/r1707362
-     2.4.x patch: svn merge -c 1707084,1707093,1707159,1707362 ^/httpd/httpd/trunk .
-     +1: icing, covener, jim
-
-  *) mod_http2:  more copying of data to disentangle worker processing from main connection
-     trunk patch: http://svn.apache.org/r1860260
-     2.4.x patch: svn merge -c 1860260 ^/httpd/httpd/trunk .
-     +1: icing, covener, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]