Promote x 1.99

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

diff --git a/STATUS b/STATUS
index 6ccf728219d91665bd634f483db273b5c2285830..83c0e1d98fa15705dfa82970435cd93c2ef6eaff 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -166,6 +166,34 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      PR: https://github.com/apache/httpd/pull/455
      +1: jorton, ylavic, rpluem
 
+   *) mod_proxy: Don't reset the balancer when we create a new child
+      and don't change shared memory mod_lbmethod_bytraffic is not using.
+      trunk patch: https://svn.apache.org/r1916004
+      2.4.x patch: svn merge -c 1916004  ^/httpd/httpd/trunk .
+      +1: jfclere, rpluem, gbechis
+
+  *) mod_http2: sync with github module. Add async handling
+     on newer httpd for blocked connections, fix yield handling.
+     Trunk version of patch:
+        https://svn.apache.org/r1918003
+        https://svn.apache.org/r1918022
+        https://svn.apache.org/r1918035
+        https://svn.apache.org/r1918078
+        https://svn.apache.org/r1918098
+        https://svn.apache.org/r1918099
+        https://svn.apache.org/r1918257
+        https://svn.apache.org/r1918482
+        https://svn.apache.org/r1918483
+        https://svn.apache.org/r1918491
+        https://svn.apache.org/r1919141
+    2.4.x version of patch:
+        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/449.diff
+    PR: https://github.com/apache/httpd/pull/449
+    +1: ylavic, icing, gbechis
+    rpluem says: PR currently has merge conflicts that need to be resolved
+    ylavic says: PR rebased and r1919141 added (colspan adjustment in mod_status)
+                 Tiny fix which needs vote reset?
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -204,32 +232,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c r1914038 ^/httpd/httpd/trunk .
       +1: minfrin
 
-   *) mod_proxy: Don't reset the balancer when we create a new child
-      and don't change shared memory mod_lbmethod_bytraffic is not using.
-      trunk patch: https://svn.apache.org/r1916004
-      2.4.x patch: svn merge -c 1916004  ^/httpd/httpd/trunk .
-      +1: jfclere, rpluem, gbechis
-
-  *) mod_http2: sync with github module. Add async handling
-     on newer httpd for blocked connections, fix yield handling.
-     Trunk version of patch:
-        https://svn.apache.org/r1918003
-        https://svn.apache.org/r1918022
-        https://svn.apache.org/r1918035
-        https://svn.apache.org/r1918078
-        https://svn.apache.org/r1918098
-        https://svn.apache.org/r1918099
-        https://svn.apache.org/r1918257
-        https://svn.apache.org/r1918482
-        https://svn.apache.org/r1918483
-        https://svn.apache.org/r1918491
-    2.4.x version of patch:
-        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/449.diff
-    PR: https://github.com/apache/httpd/pull/449
-    +1: ylavic, icing, gbechis
-    rpluem says: PR currently has merge conflicts that need to be resolved
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]