From: Ruediger Pluem <rpluem@apache.org>
Date: Sun, 27 Sep 2009 21:22:27 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.15~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d50e594d16cecb8c87993b98cb40d18d717189ed;p=thirdparty%2Fapache%2Fhttpd.git

* Promote


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

diff --git a/STATUS b/STATUS
index 6d1217cfaba..8e81fd5128d 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_dbd: Backport r708820 from trunk to avoid compiler warnings with
+   strict compilers like Sun Studio.  Mentioned on the list by Jie Gao.
+   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=708820
+   2.2.x Patch: trunk patch works with offset -6 / -9 lines.
+   +1: fuankg, trawick, rpluem
+
+ * mod_ssl: Backport of r819373 from trunk; fix wrong 3rd parameter passed
+   to to apr_brigade_split_line().  Mentioned on the list by Jie Gao.
+   Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=819373
+   2.2.x patch: trunk should work with offset.
+   +1: fuankg, trawick, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -113,18 +124,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    (applies with 40 lines offset in 2.2)
    +1: nd, minfrin
 
- * mod_dbd: Backport r708820 from trunk to avoid compiler warnings with
-   strict compilers like Sun Studio.  Mentioned on the list by Jie Gao.
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=708820
-   2.2.x Patch: trunk patch works with offset -6 / -9 lines.
-   +1: fuankg, trawick, rpluem
-
- * mod_ssl: Backport of r819373 from trunk; fix wrong 3rd parameter passed
-   to to apr_brigade_split_line().  Mentioned on the list by Jie Gao.
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=819373
-   2.2.x patch: trunk should work with offset.
-   +1: fuankg, trawick, rpluem
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre