From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 15 Jul 2014 14:42:31 +0000 (+0000)
Subject: Add comment about how to merge CHANGES entry wrt r1587201.
X-Git-Tag: 2.2.28~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b129e455afad836cbb047903c8f57383227c9a;p=thirdparty%2Fapache%2Fhttpd.git

Add comment about how to merge CHANGES entry wrt r1587201.

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

diff --git a/STATUS b/STATUS
index 5cead0dbf68..8b21dd25282 100644
--- a/STATUS
+++ b/STATUS
@@ -161,6 +161,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_proxy_sni_reuse3.patch
      +1: ylavic, rpluem
      ylavic: MMN bump in patch #3
+     ylavic: Changelog is missing in the above patches, it was added in 2.4.x
+             by r1599597 (with others...) and fixed by r1610670 (missing
+             "mod_proxy:" prefix).
 
    * mod_deflate: Fix reentrance in output and input filters (buffering of
                   incomplete Zlib header or validation bytes). PR 46146.