From: Stefan Eissing <icing@apache.org>
Date: Tue, 11 Sep 2018 14:05:24 +0000 (+0000)
Subject: cleanup after merge
X-Git-Tag: 2.4.35~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08d41d93d0d913bcb1a7a9414e7b43120783ecc5;p=thirdparty%2Fapache%2Fhttpd.git

cleanup after merge

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

diff --git a/STATUS b/STATUS
index 20e7f604912..2f7ad18f1f6 100644
--- a/STATUS
+++ b/STATUS
@@ -124,11 +124,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) http: Enforce consistently no response body with both 204 and 304 statuses.
-      trunk patch: http://svn.apache.org/r1837056
-      2.4.x patch: https://home.apache.org/~jim/patches/response-204-304.patch
-      +1: jim, ylavic, icing
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]