]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Vote, promote [skip ci].
authorYann Ylavic <ylavic@apache.org>
Mon, 10 May 2021 09:55:23 +0000 (09:55 +0000)
committerYann Ylavic <ylavic@apache.org>
Mon, 10 May 2021 09:55:23 +0000 (09:55 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1889719 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 6866eb2240fa7ae9b99e5c2b25fe10fbfa69fc59..a06768c3485508a53f2dfe5d03082ed9122df95b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -146,6 +146,20 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1888266 ^/httpd/httpd/trunk .
      +1: ylavic, icing, rpluem
 
+  *) mod_http2: fix incomplete sync with github and its version number.
+     trunk patch: http://svn.apache.org/r1889119
+     2.4.x patch: svn merge -c 1889119 ^/httpd/httpd/trunk .
+     +1: icing, rpluem, ylavic
+
+  *) core: Fix a regression that stripped the ETag header from 304 responses.
+     PR 61820
+     Trunk version of patch:
+        https://svn.apache.org/r1889341
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1889341 ^/httpd/httpd/trunk .
+     +1: rpluem, covener, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -190,21 +204,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      is not the right fix, then it should be removed from trunk.
      Putting it here is a way to revive the discussion
 
-  *) mod_http2: fix incomplete sync with github and its version number.
-     trunk patch: http://svn.apache.org/r1889119
-     2.4.x patch: svn merge -c 1889119 ^/httpd/httpd/trunk .
-     +1: icing, rpluem
-
-  *) core: Fix a regression that stripped the ETag header from 304 responses.
-     PR 61820
-     Trunk version of patch:
-        https://svn.apache.org/r1889341
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1889341 ^/httpd/httpd/trunk .
-     +1: rpluem, covener
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]