From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 6 Dec 2016 00:22:48 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.24~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1760ac65cffc1ba7bae9f1e04c912c7ffe2392f;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 9bcf6fa6f04..9083570d6c6 100644
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_lua: Fix default value of LuaInherit directive. It should be 
+     'parent-first' instead of 'none', as per documentation.  PR 60419
+     trunk patch: http://svn.apache.org/r1772489
+                  http://svn.apache.org/r1772504 (CHANGES)
+     2.4.x patch: trunk works
+     +1: jailletc36, jim, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -149,13 +155,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: compatibility note missing in the XML file
      jim:        Will address during commit
 
-  *) mod_lua: Fix default value of LuaInherit directive. It should be 
-     'parent-first' instead of 'none', as per documentation.  PR 60419
-     trunk patch: http://svn.apache.org/r1772489
-                  http://svn.apache.org/r1772504 (CHANGES)
-     2.4.x patch: trunk works
-     +1: jailletc36, jim
-
   *) SECURITY: CVE-2016-0736 (cve.mitre.org)
      mod_session_crypto: Authenticate the session data/cookie with a
      MAC (SipHash) to prevent deciphering or tampering from a padding