From: Jim Jagielski <jim@apache.org>
Date: Tue, 13 Mar 2012 12:07:17 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.4.2~204
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2ae57dda8df17e455cab4f8632d76909408cfe2;p=apache

Promote


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

diff --git a/STATUS b/STATUS
index 926371370c..440336f8bb 100644
--- a/STATUS
+++ b/STATUS
@@ -88,6 +88,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_dir: Fix "DirectoryIndex disabled" so it wipes out the current config, 
+            not just inherited config.  PR52845
+   Trunk patch: http://svn.apache.org/viewvc?rev=1297958&view=rev
+   2.4.x patch: Trunk patch works
+   +1: covener, sf, igalic
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -97,12 +102,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.4.x patch: Trunk patch works
    +1:  jim
  
- * mod_dir: Fix "DirectoryIndex disabled" so it wipes out the current config, 
-            not just inherited config.  PR52845
-   Trunk patch: http://svn.apache.org/viewvc?rev=1297958&view=rev
-   2.4.x patch: Trunk patch works
-   +1: covener, sf, igalic
-
  * core: Add ap_runtime_dir_relative() and DefaultRuntimeDir
    Trunk patch: http://svn.apache.org/viewvc?rev=1297955&view=rev
                 http://svn.apache.org/viewvc?rev=1297956&view=rev