From 376086f0e7478e7cda4c588dd58e702a9ce45b9d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 15 Nov 2012 18:38:51 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1409916 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/STATUS b/STATUS index 195805494e..4420a19bb9 100644 --- a/STATUS +++ b/STATUS @@ -89,6 +89,17 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + * core: Add in ap_get_sload() and ap_get_loadavg(). + http://svn.apache.org/viewvc?view=revision&revision=1389481 + http://svn.apache.org/viewvc?view=revision&revision=1389506 + http://svn.apache.org/viewvc?view=revision&revision=1389564 + http://svn.apache.org/viewvc?view=revision&revision=1390562 + http://svn.apache.org/viewvc?view=revision&revision=1390564 + http://svn.apache.org/viewvc?view=revision&revision=1393338 + http://svn.apache.org/viewvc?view=revision&revision=1397710 + http://svn.apache.org/viewvc?view=revision&revision=1397716 + 2.4.x patch: http://people.apache.org/~jim/patches/server-load-2.4.patch + +1: jim, jorton, igalic PATCHES PROPOSED TO BACKPORT FROM TRUNK: @@ -221,18 +232,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: http://people.apache.org/~jim/patches/bal-man-xml-2.4.patch +1: jim - * core: Add in ap_get_sload() and ap_get_loadavg(). - http://svn.apache.org/viewvc?view=revision&revision=1389481 - http://svn.apache.org/viewvc?view=revision&revision=1389506 - http://svn.apache.org/viewvc?view=revision&revision=1389564 - http://svn.apache.org/viewvc?view=revision&revision=1390562 - http://svn.apache.org/viewvc?view=revision&revision=1390564 - http://svn.apache.org/viewvc?view=revision&revision=1393338 - http://svn.apache.org/viewvc?view=revision&revision=1397710 - http://svn.apache.org/viewvc?view=revision&revision=1397716 - 2.4.x patch: http://people.apache.org/~jim/patches/server-load-2.4.patch - +1: jim, jorton, igalic - * rotatelogs: fix argument handling to exactly match docs with -p trunk patch: http://svn.apache.org/viewvc?rev=1409726&view=rev 2.4.x patch: trunk patch applies -- 2.50.1