promote

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

diff --git a/STATUS b/STATUS
index 0e89d59020508ccbf471c874e0b32c58bbf5b97d..9378e9e34ba7e3a3a332a56ebe0bc8e2439cb8b4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -77,6 +77,24 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_filter: fix merging of ! and = in FilterChain
+      PR: 42186 - patch by Issac Goldstand
+      http://svn.apache.org/viewvc?view=rev&revision=559804
+      http://svn.apache.org/viewvc?view=rev&revision=559840 (CHANGES)
+      +1: niq, rpluem, jim
+
+    * mod_filter: fix integer comparisons
+      PR: 41835
+      http://svn.apache.org/viewvc?view=rev&revision=559837
+      http://svn.apache.org/viewvc?view=rev&revision=559840 (CHANGES)
+      http://svn.apache.org/viewvc?view=rev&revision=559999
+      +1: niq, rpluem, jim
+
+    * mime.types: Use registered types for Javascript/ECMAscript (RFC4329)
+      PR: 40299
+      http://svn.apache.org/viewvc?view=rev&revision=560533
+      http://svn.apache.org/viewvc?view=rev&revision=562236
+      +1: niq, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -293,19 +311,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: rpluem
 
-    * mod_filter: fix merging of ! and = in FilterChain
-      PR: 42186 - patch by Issac Goldstand
-      http://svn.apache.org/viewvc?view=rev&revision=559804
-      http://svn.apache.org/viewvc?view=rev&revision=559840 (CHANGES)
-      +1: niq, rpluem, jim
-
-    * mod_filter: fix integer comparisons
-      PR: 41835
-      http://svn.apache.org/viewvc?view=rev&revision=559837
-      http://svn.apache.org/viewvc?view=rev&revision=559840 (CHANGES)
-      http://svn.apache.org/viewvc?view=rev&revision=559999
-      +1: niq, rpluem, jim
-
     * mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability
       to authorize an authenticated user via a "require ldap-group X" directive
       where the user is not in group X, but is in a subgroup contained in X.
@@ -317,12 +322,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://people.apache.org/~rederpj/NestedGroups_2.2.xBranch.diff 
       +1: rederpj
 
-    * mime.types: Use registered types for Javascript/ECMAscript (RFC4329)
-      PR: 40299
-      http://svn.apache.org/viewvc?view=rev&revision=560533
-      http://svn.apache.org/viewvc?view=rev&revision=562236
-      +1: niq, rpluem, jim
-
     * mime.types: Add registered Apple installer type
       PR: 40379
       Comment: if "pkg" or "dist" is overloaded in the context of