summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2018-01-04 17:35:29 +0000
committerYann Ylavic <ylavic@apache.org>2018-01-04 17:35:29 +0000
commitce071e2f2c3a8cd9d2dccff29e9790db8076e2ac (patch)
tree1772cfb274cf91c44771d7b5d31ffbea1b0d4a7f
parent84834b3a08918fe2926aa9d5a2779a8433f5289f (diff)
downloadhttpd-ce071e2f2c3a8cd9d2dccff29e9790db8076e2ac.tar.gz
Update proposal with correct APLOGNO (thanks Christophe!).
No need to reset Stefan\'s vote I guess... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1820150 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS7
1 files changed, 4 insertions, 3 deletions
diff --git a/STATUS b/STATUS
index dfd8557380..17f9f9b06a 100644
--- a/STATUS
+++ b/STATUS
@@ -247,11 +247,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
http://svn.apache.org/r1818960
http://svn.apache.org/r1819027
http://svn.apache.org/r1819214
+ http://svn.apache.org/r1820035
2.4.x patch: trunk works (modulo CHANGES)
- svn merge -c 1818804,1818951,1818958,1818960,1819027,1819214 ^/httpd/httpd/trunk .
- http://home.apache.org/~ylavic/patches/PR61551.patch
+ svn merge -c 1818804,1818951,1818958,1818960,1819027,1819214,1820035 ^/httpd/httpd/trunk .
+ http://home.apache.org/~ylavic/patches/PR61551+APLOGNO.patch
+1: ylavic, icing
- jailletc36: an APLOGNO is missing a value. Fixed in r1820035
+
PATCHES/ISSUES THAT ARE BEING WORKED
[ New entries should be added at the START of the list ]