From: Jim Jagielski <jim@apache.org>
Date: Fri, 30 May 2008 12:37:36 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.9~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08fc745c306ebab2b64e614e2768c05601b7b579;p=thirdparty%2Fapache%2Fhttpd.git

promote


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661689 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 8f895e68297..29f6f2362e6 100644
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * scoreboard: Remove unused proxy load balancer elements from scoreboard
+     image (not scoreboard memory itself).  Array of lb_score elements
+     originally added in r104404 in manner akin to that used for
+     worker_score.  Supporting code then removed in r105134 but scoreboard
+     image size calculation left in place, likely by accident.
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=404848
+     Backport version for 2.2.x:
+       http://people.apache.org/~chrisd/patches/scoreboard_lb_score/scoreboard-lb_score-2.2.x.patch
+     +1: chrisd, rpluem, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -133,17 +144,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    -1: niq - strcasecmp(NULL, ...) when secure is not set
    rpluem: Good catch. Should be fixed by r660461.
 
-   * scoreboard: Remove unused proxy load balancer elements from scoreboard
-     image (not scoreboard memory itself).  Array of lb_score elements
-     originally added in r104404 in manner akin to that used for
-     worker_score.  Supporting code then removed in r105134 but scoreboard
-     image size calculation left in place, likely by accident.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=404848
-     Backport version for 2.2.x:
-       http://people.apache.org/~chrisd/patches/scoreboard_lb_score/scoreboard-lb_score-2.2.x.patch
-     +1: chrisd, rpluem, jim
-
  * mod_proxy_http, mod_proxy_ajp, mod_proxy_balancer: Make modules nocanon aware
    and do not add the query string again in this case. PR 44803
    [Jim Jagielski, Ruediger Pluem]