From: Jim Jagielski <jim@apache.org>
Date: Mon, 26 Jun 2017 12:18:53 +0000 (+0000)
Subject: promote proposal
X-Git-Tag: 2.4.27~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d5e345c4335ccd01113f6b51992f9cac334a873;p=thirdparty%2Fapache%2Fhttpd.git

promote proposal


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

diff --git a/STATUS b/STATUS
index 8b13ec08c98..5ed367e4b14 100644
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) core: Avoid duplicate HEAD in Allow header. PR 61207.
+      trunk patch: http://svn.apache.org/r1799784
+                   http://svn.apache.org/r1799786 (CHANGES entry)
+      2.4.x patch: svn merge -c 1799784,1799786 ^/httpd/httpd/trunk .
+      +1: jailletc36, rpluem, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -217,13 +224,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c 1551611,1783765,1788996,1788998,1789000,1795651 ^/httpd/httpd/trunk .
       +1: jailletc36, jim
 
-   *) core: Avoid duplicate HEAD in Allow header. PR 61207.
-      trunk patch: http://svn.apache.org/r1799784
-                   http://svn.apache.org/r1799786 (CHANGES entry)
-      2.4.x patch: svn merge -c 1799784,1799786 ^/httpd/httpd/trunk .
-      +1: jailletc36, rpluem, jim
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]