From: Graham Leggett <minfrin@apache.org>
Date: Mon, 13 Jun 2016 23:10:53 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.21~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35282aaf857db6309bd8a50c25928912a9eff2c9;p=apache

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 005b1ccf34..162c2282f4 100644
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_cache: Fix (max-stale with no '=') and enforce (check integers after '=')
+     Cache-Control header parsing.
+     trunk patch: http://svn.apache.org/r1715886
+     2.4.x: trunk works
+     +1: jailletc36, jim, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -201,12 +206,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: trunk works
      +1: jailletc36, jim
 
-  *) mod_cache: Fix (max-stale with no '=') and enforce (check integers after '=')
-     Cache-Control header parsing.
-     trunk patch: http://svn.apache.org/r1715886
-     2.4.x: trunk works
-     +1: jailletc36, jim
-
   *) mod_dav: Add support for childtags to dav_error.
      trunk patch: http://svn.apache.org/r1747810
      2.4.x: trunk works modulo CHANGES/MMN