From: Jim Jagielski <jim@apache.org>
Date: Sun, 9 Oct 2011 12:34:35 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.2.22~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a66cb0e4736734e5cc70a44eebaaf09c2355aa26;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 3572f7fddc3..02c606a8ee3 100644
--- a/STATUS
+++ b/STATUS
@@ -92,6 +92,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core: Fix hook sorting for perl modules, a regression introduced in 2.2.21
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1180325
+    2.2.x patch: http://people.apache.org/~sf/2.2_hook_sorting.diff
+    +1: sf, trawick, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -163,11 +168,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~rjung/patches/default-sslciphersuite_and_sslhonorciphers_2.2.patch
     +1: rjung, sf
 
-  * core: Fix hook sorting for perl modules, a regression introduced in 2.2.21
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1180325
-    2.2.x patch: http://people.apache.org/~sf/2.2_hook_sorting.diff
-    +1: sf, trawick, jim
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of