* Vote and promote [skip ci]

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

diff --git a/STATUS b/STATUS
index 3e0aa0a7aa2aa07250ad4be642679279fcf51e95..71a0e56105cd07eb0649ded8a9f2d7476b3f9ff6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -160,17 +160,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       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 ]
-
- *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
-    dav_get_resource() to mod_dav.h.
-    trunk patch: http://svn.apache.org/r1879305
-                 http://svn.apache.org/r1879466
-    2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
-    +1: minfrin
-    ylavic: patch is 404
-
    *) core/mod_ssl/mod_md:
      - adding new ap_ssl_*() functions for a backward
        compatible replacement of the major optional mod_ssl functions. This
@@ -189,12 +178,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        r1888723, r1888724, r1888726, r1888729
      PR: https://github.com/apache/httpd/pull/179
      patch: https://github.com/apache/httpd/pull/179.diff
-     +1: icing, ylavic
+     +1: icing, ylavic, rpluem
      ylavic: some "<<<<<<< HEAD" hunk in ap_mmn.h should be remove on
              backport..
      jailletc36: pull/179 has been updated with r1889009
      icing: fixed the merge garbage in ap_mmn.h. thanks Yann.
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+ *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
+    dav_get_resource() to mod_dav.h.
+    trunk patch: http://svn.apache.org/r1879305
+                 http://svn.apache.org/r1879466
+    2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
+    +1: minfrin
+    ylavic: patch is 404
+
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505
      2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .