]> granicus.if.org Git - apache/commitdiff
Promote.
authorRainer Jung <rjung@apache.org>
Thu, 8 Jan 2015 16:07:03 +0000 (16:07 +0000)
committerRainer Jung <rjung@apache.org>
Thu, 8 Jan 2015 16:07:03 +0000 (16:07 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1650319 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index baa756c261e27a5b3e4620d143739c629289d4d1..da7a81ea34eb72806d49bf248d3536b2e91d72ba 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -130,6 +130,22 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1 jkaluza, ylavic, covener
 
+   * core: Add ap_log_data(), ap_log_rdata(), etc. for logging buffers.
+     trunk patch: http://svn.apache.org/r1512819
+                  http://svn.apache.org/r1513461 ONLY the change to http_log.h
+                  http://svn.apache.org/r1565777
+                  http://svn.apache.org/r1643538
+     2.4.x patch: http://people.apache.org/~trawick/ap_log_data-to-2.4.x.txt
+                  (trunk works with the expected minor conflicts in CHANGES
+                  and ap_mmn.h)
+     +1: trawick, covener, rjung
+
+   * mod_autoindex: Fix (add) css attribute for description column when column
+                    contains no data. PR 57227. [Bruno Raoult]
+     trunk patch: http://svn.apache.org/r1648201
+     2.4.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32209
+     +1: druggeri, gsmith, rjung
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -217,16 +233,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1 covener, jim
 
-   * core: Add ap_log_data(), ap_log_rdata(), etc. for logging buffers.
-     trunk patch: http://svn.apache.org/r1512819
-                  http://svn.apache.org/r1513461 ONLY the change to http_log.h
-                  http://svn.apache.org/r1565777
-                  http://svn.apache.org/r1643538
-     2.4.x patch: http://people.apache.org/~trawick/ap_log_data-to-2.4.x.txt
-                  (trunk works with the expected minor conflicts in CHANGES
-                  and ap_mmn.h)
-     +1: trawick, covener, rjung
-
    * mod_proxy_ajp: Fix client connection errors handling and logged status
                     when it occurs.  PR 56823.
      trunk patch: http://svn.apache.org/r1643537
@@ -278,12 +284,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-mod_journald.patch
      +1: jkaluza
 
-   * mod_autoindex: Fix (add) css attribute for description column when column
-                    contains no data. PR 57227. [Bruno Raoult]
-     trunk patch: http://svn.apache.org/r1648201
-     2.4.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32209
-     +1: druggeri, gsmith, rjung
-
    * core: Fix long lines in config file w/ continuations. PR 55910
      trunk patch: http://svn.apache.org/r1648394
      2.4.x patch: trunk works