From: Graham Leggett <minfrin@apache.org>
Date: Fri, 16 May 2014 23:21:27 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.10~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bb66cc858bccd615cc7c941ea6289f3b82fc9d3;p=apache

Vote, promote.


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

diff --git a/STATUS b/STATUS
index 2babd2f590..75bd48a9da 100644
--- a/STATUS
+++ b/STATUS
@@ -100,6 +100,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_cache: Don't add cached/revalidated entity headers to a 304 response.
+                PR 55547.
+     trunk patch: http://svn.apache.org/r1591320
+                  http://svn.apache.org/r1591322
+                  http://svn.apache.org/r1591390
+                  http://svn.apache.org/r1591394
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_cache-strip_304_entity_headers.patch
+     +1: ylavic, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -186,15 +195,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: When merged, a compatibility note should be added in the doc stating when
                  the none keyword has been added
 
-   * mod_cache: Don't add cached/revalidated entity headers to a 304 response.
-                PR 55547.
-     trunk patch: http://svn.apache.org/r1591320
-                  http://svn.apache.org/r1591322
-                  http://svn.apache.org/r1591390
-                  http://svn.apache.org/r1591394
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_cache-strip_304_entity_headers.patch
-     +1: ylavic, jim
-
    * mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
                          PR 55320.
      trunk patch: http://svn.apache.org/r1594625