From: Stefan Eissing <icing@apache.org>
Date: Thu, 27 Apr 2017 14:24:56 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.26~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ed2f30062fb85f6ad224a70434c3c71ec416d55;p=thirdparty%2Fapache%2Fhttpd.git

promote

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

diff --git a/STATUS b/STATUS
index 30d3a440c22..d120a099c3d 100644
--- a/STATUS
+++ b/STATUS
@@ -115,22 +115,6 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-  *) mod_proxy_hcheck: Honor checks in Vhosts w/o hanging
-     trunk patch: http://svn.apache.org/r1784203
-                  http://svn.apache.org/r1784205
-                  http://svn.apache.org/r1784227
-                  http://svn.apache.org/r1784228
-                  http://svn.apache.org/r1784275
-                  http://svn.apache.org/r1785871
-                  http://svn.apache.org/r1786009
-                  http://svn.apache.org/r1789387
-     2.4.x patch: trunk works *after r1779573 above* (modulo CHANGES)
-              ie: http://home.apache.org/~ylavic/patches/httpd2.4-hcheck-after-r1779573.patch
-           FULL hcheck patch: http://home.apache.org/~jim/patches/httpd2.4-hcheck.patch
-                              http://svn.apache.org/r1789387
-           (includes all hcheck related patches, including showstopper)
-     +1: jim, ylavic, icing
-
    *) confirm ab + https w/ openssl 1.1.0 on unix is OK.
       Gregg says it's broken on Windows.
       Document it somewhere either way.
@@ -155,6 +139,22 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy_hcheck: Honor checks in Vhosts w/o hanging
+     trunk patch: http://svn.apache.org/r1784203
+                  http://svn.apache.org/r1784205
+                  http://svn.apache.org/r1784227
+                  http://svn.apache.org/r1784228
+                  http://svn.apache.org/r1784275
+                  http://svn.apache.org/r1785871
+                  http://svn.apache.org/r1786009
+                  http://svn.apache.org/r1789387
+     2.4.x patch: trunk works *after r1779573 above* (modulo CHANGES)
+              ie: http://home.apache.org/~ylavic/patches/httpd2.4-hcheck-after-r1779573.patch
+           FULL hcheck patch: http://home.apache.org/~jim/patches/httpd2.4-hcheck.patch
+                              http://svn.apache.org/r1789387
+           (includes all hcheck related patches, including showstopper)
+     +1: jim, ylavic, icing
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]