Promote, promote and vote

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

diff --git a/STATUS b/STATUS
index 53a86dd538b25d82700afb0e0ce4908726f3ca4a..c164d827703001a3da24484fbbf6e69daea2e0ff 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -105,13 +105,8 @@ CURRENT RELEASE NOTES:
       branches/2.2.x, and finally merge into branches/2.0.x, as applicable.
 
 
-tch is at                              
 RELEASE SHOWSTOPPERS:
 
-
-PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
-  [ start all new proposals below, under PATCHES PROPOSED. ]
-
     *) http_protocol: Fix escaping of Expect error message
         Trunk version of patch:
           http://svn.apache.org/viewcvs?rev=394965&view=rev
@@ -120,17 +115,8 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       +1: mjc, trawick, rpluem, jim
 
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ please place SVN revisions from trunk here, so it is easy to
-    identify exactly what the proposed changes are!  Add all new
-    proposals to the end of this list. ]
-
-    *) Reverse Proxy fixes: <Location> bug and Cookie support
-        Patch is at
-        http://people.apache.org/~colm/httpd-2.0-reverse-proxy-cookie.patch
-        and is in production with Clients.
-       +1: niq
-       +0: wrowe; looks good, no way to apply this without a minor bump
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
 
     *) mod_cgid: Fix PR 36410. Invoke the set_suexec_identity hook from
        the non-cgid side of the handler, where the full per-server/dir/etc
@@ -142,6 +128,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=113813652015559
        +1: colm, trawick, jim
 
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ please place SVN revisions from trunk here, so it is easy to
+    identify exactly what the proposed changes are!  Add all new
+    proposals to the end of this list. ]
+
+    *) Reverse Proxy fixes: <Location> bug and Cookie support
+        Patch is at
+        http://people.apache.org/~colm/httpd-2.0-reverse-proxy-cookie.patch
+        and is in production with Clients.
+       +1: niq
+       +1: wrowe; looks good, no way to apply this without a minor bump
+
     *) Backport 102870; PR 17217; stop linking OpenSSL to support/*
        binaries (especially when compiled --with-static-support (!))
        and fix mod_ssl.so when compiled against .a openssl archives.