From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 4 Jan 2017 22:24:06 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.2.32~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=247f0d7b6f14caf9bf11d548d2ef730090f6b914;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 20f1ac18818..22efe2f45b5 100644
--- a/STATUS
+++ b/STATUS
@@ -99,6 +99,9 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
   *) Rather than odds-and-ends applied out of order, proposing we revert
      r1757240, r1757256, r1757295, r1758671, r1758672, r1775232, all of
      which is now recorded in the 2.2.x-merge-http-strict branch, and
@@ -123,13 +126,13 @@ RELEASE SHOWSTOPPERS:
        Sorry to start from scratch, but yann's correct observation was correct,
        that nothing will apply out-of-order, and everything on 2.2 branch had
        already become disordered.
-     +1: wrowe, covener
+     +1: wrowe, covener, ylavic
      covener: 
        - need to rebase patch on branch to pick up one-liner changes in
          r1777178 and r1777182
-
-PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
-  [ start all new proposals below, under PATCHES PROPOSED. ]
+     ylavic:
+        httpd-2.2-HEAD-http-protocol-strict.patch + r1777178 + r1777182 worked,
+        but not the former procedure (merge conflicts).
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK: