Vote, promote.

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

diff --git a/STATUS b/STATUS
index fa2e9414ba792e7ffac88a3b4cea7923aac3bd39..ee0a9bfb61fa929dc99a5c69d09ef88905cb5c07 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * easy proposals to synch 2.4.x and trunk
+      - Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
+      - remove unused variables
+      - axe some useless assignments (clang scan-build)
+      - Remove useless apr_pstrdup as done for other mod_auth modules in r1026660
+      - Remove unused APXS setting from template for generated Makefile
+    trunk patches:
+      - https://svn.apache.org/viewvc?view=revision&revision=1464674
+      - https://svn.apache.org/viewvc?view=revision&revision=1465084
+      - https://svn.apache.org/viewvc?view=revision&revision=1534997
+      - https://svn.apache.org/viewvc?view=revision&revision=1538149
+      - https://svn.apache.org/viewvc?view=revision&revision=1535699
+    2.4.x patches: trunk patches work
+      - the 3 first ones partially apply because of files which are not part of 2.4.x
+        http://people.apache.org/~jim/patches/ez-2.4-v1.patch
+    +1: jailletc36, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -146,23 +163,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: http://people.apache.org/~jim/patches/proxy-port-scheme.patch
     +1: jim
 
-  * easy proposals to synch 2.4.x and trunk
-      - Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
-      - remove unused variables
-      - axe some useless assignments (clang scan-build)
-      - Remove useless apr_pstrdup as done for other mod_auth modules in r1026660
-      - Remove unused APXS setting from template for generated Makefile
-    trunk patches:
-      - https://svn.apache.org/viewvc?view=revision&revision=1464674
-      - https://svn.apache.org/viewvc?view=revision&revision=1465084
-      - https://svn.apache.org/viewvc?view=revision&revision=1534997
-      - https://svn.apache.org/viewvc?view=revision&revision=1538149
-      - https://svn.apache.org/viewvc?view=revision&revision=1535699
-    2.4.x patches: trunk patches work
-      - the 3 first ones partially apply because of files which are not part of 2.4.x
-        http://people.apache.org/~jim/patches/ez-2.4-v1.patch
-    +1: jailletc36, jim
-
   * mod_proxy_http: Core dumped under high load. Bugz 50335
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1534321
                  http://svn.apache.org/viewvc?view=revision&revision=1550061