From: Jim Jagielski <jim@apache.org>
Date: Tue, 23 Jul 2013 16:03:36 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.7~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea0eb915d7823a2cd8addfa18eabb0e8f73c5f1c;p=apache

promote


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

diff --git a/STATUS b/STATUS
index e83d273451..aeb63d518c 100644
--- a/STATUS
+++ b/STATUS
@@ -92,6 +92,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * support/htdbm: fix processing of -t command line switch. Regression
+    introduced in 2.4.4
+    PR55264 [Jo Rhett <jrhett netconsonance com>]
+    trunk: http://svn.apache.org/r1503866
+    2.4.x patch: trunk works
+    +1: jailletc36, druggeri, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -204,13 +210,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk works (minus log-message-tags)
     +1: rjung
 
-  * support/htdbm: fix processing of -t command line switch. Regression
-    introduced in 2.4.4
-    PR55264 [Jo Rhett <jrhett netconsonance com>]
-    trunk: http://svn.apache.org/r1503866
-    2.4.x patch: trunk works
-    +1: jailletc36, druggeri, jim
-
   * Makefile.win: Install proper pcre DLL file during debug build install
     PR55235 [Ben Reser <ben reser org>]
     trunk: http://svn.apache.org/r1505073