diff options
| author | Jim Jagielski <jim@apache.org> | 2018-02-19 18:11:38 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2018-02-19 18:11:38 +0000 |
| commit | 4f774d200150c37dafbe4dee015a391072c4bf80 (patch) | |
| tree | f7b42bb3f968e0ff82f2ee27323cd105ad8a692a | |
| parent | 5cc666d5c07b6f46f5688e7d10b63002e24ebbb8 (diff) | |
| download | httpd-4f774d200150c37dafbe4dee015a391072c4bf80.tar.gz | |
Backport votes... not promoting those with 3 in case we
decide to do another T&R for 2.4.31 to correct some
process flaws/inconsistencies
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824799 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | STATUS | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -145,7 +145,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1824381 2.4.x patch: svn merge ^/httpd/httpd/branches/2.4.x-mpm_fdqueue . (http://home.apache.org/~ylavic/patches/httpd-2.4.x-mpm_fdqueue.patch) - +1: ylavic, minfrin + +1: ylavic, minfrin, jim ylavic: The branch merge helps resolve move conflicts since event and worker fdqueue.[ch] differ(ed) between 2.4.x and trunk. The patch is provided only to help review. @@ -167,7 +167,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: (trunk works if mpm_queue above is merged first, otherwise the mpm_queue branch can also be synchronized after this merge, YMMV :) - +1: ylavic, minfrin (with mmn bump for CONN_STATE_NUM) + +1: ylavic, minfrin (with mmn bump for CONN_STATE_NUM), jim *) mod_dav: Allow other modules to become providers and add ACLs to the DAV response. @@ -175,7 +175,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1824590 http://svn.apache.org/r1824596 2.4.x: trunk works modulo CHANGES/MMN/log-message - +1: minfrin + +1: minfrin, jim PATCHES/ISSUES THAT ARE BEING WORKED |