From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 14 Feb 2019 12:01:41 +0000 (+0000)
Subject: Don't pretend r1807318 is merged in 100-continue proposal.
X-Git-Tag: 2.4.39~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65edeb1fe7c39724cb7121b85b359c18c5b09196;p=thirdparty%2Fapache%2Fhttpd.git

Don't pretend r1807318 is merged in 100-continue proposal.

This commit was merged to help with conflicts only, it's finally a noop
for the final result. Since it refences an unmerged issue, it rather be
merged/recorded in PR 59007's context.


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

diff --git a/STATUS b/STATUS
index 74661c0450b..b5027530037 100644
--- a/STATUS
+++ b/STATUS
@@ -246,7 +246,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1729507
                   http://svn.apache.org/r1729749
                   http://svn.apache.org/r1754159
-                  http://svn.apache.org/r1807318
                   http://svn.apache.org/r1836588
                   http://svn.apache.org/r1836648
                   http://svn.apache.org/r1836716