promote

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

diff --git a/STATUS b/STATUS
index baa51ce5e3d21520ef3d446b5c9298d4134bd499..6905b89cef6272bb58964f84bfff869c1b72a141 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -118,29 +118,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
-  *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
-     allowing per backend TLS configuration.
-     trunk patch: http://svn.apache.org/r1740928
-                  http://svn.apache.org/r1740960
-                  http://svn.apache.org/r1740967
-                  http://svn.apache.org/r1740987
-                  http://svn.apache.org/r1740998
-                  http://svn.apache.org/r1742697
-                  http://svn.apache.org/r1756976
-                  http://svn.apache.org/r1781313
-     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co-v3.patch
-     +1: ylavic
-
   *) mod_proxy_hcheck: Don't validate timed out responses.
      trunk patch: http://svn.apache.org/r1779574
                   http://svn.apache.org/r1779623
      2.4.x patch: trunk works *after r1779573 above* (modulo CHANGES)
      +1: ylavic, jim, druggeri
 
+  *) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
+     format from 2.2 in the Last Modified column. PR60846.
+     trunk patch: http://svn.apache.org/r1787525
+                  http://svn.apache.org/r1787553
+                  http://svn.apache.org/r1788451
+     2.4.x patch: trunk works
+     +1 covener, jim, druggeri
+
   *) mod_ssl: backport fix for PR 46037
      trunk patch: http://svn.apache.org/r1781575
                   http://svn.apache.org/r1781577
@@ -154,6 +145,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: +1 with http://svn.apache.org/r1788430, fixing the merge of
              SSLOCSPNoverify and capitalizing as suggested above.
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+  *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
+     allowing per backend TLS configuration.
+     trunk patch: http://svn.apache.org/r1740928
+                  http://svn.apache.org/r1740960
+                  http://svn.apache.org/r1740967
+                  http://svn.apache.org/r1740987
+                  http://svn.apache.org/r1740998
+                  http://svn.apache.org/r1742697
+                  http://svn.apache.org/r1756976
+                  http://svn.apache.org/r1781313
+     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co-v3.patch
+     +1: ylavic
+
+
   *) mod_proxy_hcheck: Honor checks in Vhosts
      trunk patch: http://svn.apache.org/r1784203
                   http://svn.apache.org/r1784205
@@ -174,14 +182,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              default value (as expected).
      jim: Committed in r1789387
 
-  *) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
-     format from 2.2 in the Last Modified column. PR60846.
-     trunk patch: http://svn.apache.org/r1787525
-                  http://svn.apache.org/r1787553
-                  http://svn.apache.org/r1788451
-     2.4.x patch: trunk works
-     +1 covener, jim, druggeri
-
   *) mod_remoteip: Add PROXY protocol support
      trunk patch: http://svn.apache.org/r1776575
                   http://svn.apache.org/r1776578 (doc fix)