promote

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

diff --git a/STATUS b/STATUS
index 0cc023e644d9cddab207fb6674e217ad8c386c8c..f1e38ba4d112f97db11f8d6eaa017b85b362b1c7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -97,6 +97,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_authn_socache: Support optional arguments for socache provider.
+    trunk patch: http://svn.apache.org/r1531961
+    2.4.x patch: trunk patch works, modulo CHANGES and doc compatibility note
+    +1: chrisd, covener, jim
+
+  * mod_headers: Allow for format specifiers to be used in the base
+    substitution string when using Header edit
+    trunk patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.trunk.patch
+    2.4.x patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.2.4.patch
+    +1: druggeri, covener, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -190,17 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              without mod_request and mod_session present would cause the very
              same failure. Would a warning in the release notes be good enough?
 
-  * mod_authn_socache: Support optional arguments for socache provider.
-    trunk patch: http://svn.apache.org/r1531961
-    2.4.x patch: trunk patch works, modulo CHANGES and doc compatibility note
-    +1: chrisd, covener, jim
-
-  * mod_headers: Allow for format specifiers to be used in the base
-    substitution string when using Header edit
-    trunk patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.trunk.patch
-    2.4.x patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.2.4.patch
-    +1: druggeri, covener, jim
-
   * event MPM: null out c->sbh more carefully as we enter keepalive
     trunk patch: http://svn.apache.org/r1538490
     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-event-sbh.diff