From: Graham Leggett <minfrin@apache.org>
Date: Mon, 13 Jun 2016 23:18:50 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.21~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4e190ae9250c2e815cb0be1e4cdda2ef1caa154;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index f5c0f9fa87a..ef667dad321 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_userdir: Constify and save a few bytes in the conf pool when parsing
+     "UserDir" directive
+     trunk patch: http://svn.apache.org/r1745835
+     2.4.x: trunk works
+     +1: jailletc36, jim, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -195,12 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: gsmith,
      +0: wrowe [I did not observe such issues, and will review the patch/issue]
 
-  *) mod_userdir: Constify and save a few bytes in the conf pool when parsing
-     "UserDir" directive
-     trunk patch: http://svn.apache.org/r1745835
-     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