From: Jim Jagielski <jim@apache.org>
Date: Sun, 16 Aug 2009 15:52:17 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.14~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc8a8bf0c90bfbbdd5b71e127d6246cd60db983;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 536904989ca..17bbf0f699b 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_ssl: backport of r630858. Mentioned by Peter Sylvester.
+   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=630858
+   2.2.x Patch: trunk patch applies (with offset -22 lines).
+   +1: fuankg, rpluem, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -118,11 +122,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    -0: wrowe; Please refer to man 'access' BUGS section about linux 2.4 
               vs 2.6 kernels, potentially a suspect test for root.
 
- * mod_ssl: backport of r630858. Mentioned by Peter Sylvester.
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=630858
-   2.2.x Patch: trunk patch applies (with offset -22 lines).
-   +1: fuankg, rpluem, jim
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre