promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800773 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 07143b67d522001d3ff4e45acf3a1001b5a122e7..b346729552a02aff83a7f96864346f9bf2bff95e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) mod_http2: disable and give warning when prefork is configured. h2 will no longer
+                 participate in protocol negotiation, server will continue to work.
+     trunk patch: http://svn.apache.org/r1800689
+     2.4.x patch:  svn merge -c 1800689 ^/httpd/httpd/trunk .
+     +1: icing, ylavic, jim
+
+   *)  htpasswd / htdigest: Do not apply the strict permissions of the temporary
+       passwd file to a possibly existing passwd file. PR 61240.
+     trunk patch: http://svn.apache.org/r1800594
+     2.4.x patch:  svn merge -c 1800594 ^/httpd/httpd/trunk .
+     +1: rpluem, ylavic, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -194,19 +206,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 If confirmed, it would worth, IMHO, a CHANGE entry and maybe a
                 2.2.x backport.
 
-   *) mod_http2: disable and give warning when prefork is configured. h2 will no longer
-                 participate in protocol negotiation, server will continue to work.
-     trunk patch: http://svn.apache.org/r1800689
-     2.4.x patch:  svn merge -c 1800689 ^/httpd/httpd/trunk .
-     +1: icing, ylavic, jim
-
-   *)  htpasswd / htdigest: Do not apply the strict permissions of the temporary
-       passwd file to a possibly existing passwd file. PR 61240.
-     trunk patch: http://svn.apache.org/r1800594
-     2.4.x patch:  svn merge -c 1800594 ^/httpd/httpd/trunk .
-     +1: rpluem, ylavic, jim
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]