summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2018-08-08 11:46:52 +0000
committerJim Jagielski <jim@apache.org>2018-08-08 11:46:52 +0000
commit5323a97e5c2600506560af76de19f7182707c254 (patch)
treeda5b8053a399271ee9e4a1e685079310d3730cc8
parent585e27a3cc4e09f55bae25c0473e7da09b8c3c80 (diff)
downloadhttpd-5323a97e5c2600506560af76de19f7182707c254.tar.gz
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837644 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS11
1 files changed, 5 insertions, 6 deletions
diff --git a/STATUS b/STATUS
index 61ab9709ae..2852c3c732 100644
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+1: jailletc36, ylavic (by inspection), covener
jailletc36: untested, but looks straight forward enough to vote
+ *) Build tweaks: fix make -j install, Fedora config.layout.
+ trunk: http://svn.apache.org/r1836469
+ http://svn.apache.org/r1836154
+ 2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk .
+ +1: jorton, covener, jim
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
@@ -177,12 +182,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk .
+1: jailletc36, jim (via inspection)
- *) Build tweaks: fix make -j install, Fedora config.layout.
- trunk: http://svn.apache.org/r1836469
- http://svn.apache.org/r1836154
- 2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk .
- +1: jorton, covener, jim
-
*) Support IPv6-sized client strings in mod_status and mod_echo
trunk: http://svn.apache.org/r1837225
http://svn.apache.org/r1837366