From 2edbed0ffaabe053b6a772a7db1b70d19a4d2a82 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 8 Sep 2017 10:10:53 +0000 Subject: [PATCH] Promote. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807706 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index c9ea467c36..5aa89e34b8 100644 --- a/STATUS +++ b/STATUS @@ -157,6 +157,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1803420,1803454,1804090 ^/httpd/httpd/trunk . +1: icing, steffenal, ylavic + *) mod_watchdog/mod_proxy_hcheck: Now accept ms interval settings + trunk patch: http://svn.apache.org/r1799435 + http://svn.apache.org/r1799437 + http://svn.apache.org/r1805206 (partial) + http://svn.apache.org/r1805322 + 2.4.x patch: http://home.apache.org/~jim/patches/httpd-2.4-hcheck-ms.patch + +1: jim, covener, ylavic + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -239,14 +247,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch svn merge -c 1745039 ^/httpd/httpd/trunk . +1: jim, ylavic - *) mod_watchdog/mod_proxy_hcheck: Now accept ms interval settings - trunk patch: http://svn.apache.org/r1799435 - http://svn.apache.org/r1799437 - http://svn.apache.org/r1805206 (partial) - http://svn.apache.org/r1805322 - 2.4.x patch: http://home.apache.org/~jim/patches/httpd-2.4-hcheck-ms.patch - +1: jim, covener, ylavic - *) mod_proxy: Loadfactor can now be a decimal number (eg: 1.25) trunk patch: http://svn.apache.org/r1805188 http://svn.apache.org/r1805206 (partial) -- 2.40.0