* Promote

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

diff --git a/STATUS b/STATUS
index 6459ecda522f40abe42197999a811093ff6146c0..bc0625cd517bcb3c245677178befcb4b63e3e09c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,32 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * core: Add the filename of the configuration file to the warning message
+   about the useless use of AllowOverride. PR 39992
+    Trunk version of patch:
+       http://svn.apache.org/viewvc?rev=420307&view=rev
+    Backport version for 2.2.x of patch:
+       Trunk version of patch works
+    +1: rpluem, jim, pquerna
+
+ * htpasswd: Fix salt generation weakness. PR 31440
+   [Andreas Krennmair <ak synflood.at>, Peter Watkins <peterw tux.org>, Paul Querna]
+    Trunk version of patch:
+       http://svn.apache.org/viewvc?rev=629159&view=rev
+       http://svn.apache.org/viewvc?rev=629164&view=rev
+       http://svn.apache.org/viewvc?rev=629218&view=rev
+       http://svn.apache.org/viewvc?rev=630139&view=rev
+    Backport version for 2.2.x of patch:
+       Trunk version of patch works
+    +1: rpluem, jim, pquerna
+
+ * mod_unique_id: Convert request time to seconds before before storing it in
+   unique_id_rec struct. PR 37064
+    Trunk version of patch:
+       http://svn.apache.org/viewvc?rev=596448&view=rev
+    Backport version for 2.2.x of patch:
+       Trunk version of patch works
+    +1: rpluem, jim, pquerna
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -157,33 +183,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works (minus CHANGES conflict)
     +1: jorton, jim
 
- * core: Add the filename of the configuration file to the warning message
-   about the useless use of AllowOverride. PR 39992
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=420307&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, jim, pquerna
-
- * htpasswd: Fix salt generation weakness. PR 31440
-   [Andreas Krennmair <ak synflood.at>, Peter Watkins <peterw tux.org>, Paul Querna]
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=629159&view=rev
-       http://svn.apache.org/viewvc?rev=629164&view=rev
-       http://svn.apache.org/viewvc?rev=629218&view=rev
-       http://svn.apache.org/viewvc?rev=630139&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, jim, pquerna
-
- * mod_unique_id: Convert request time to seconds before before storing it in
-   unique_id_rec struct. PR 37064
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=596448&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, jim, pquerna
-
 PATCHES/ISSUES THAT ARE STALLED
 
    * beos MPM: Create pmain pool and run modules' child_init hooks when