Update

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

diff --git a/STATUS b/STATUS
index 7137509ce433d6b12f42034cc45d51db0bec43fa..9ab4a77ea13f70b3c0c287c901b956a08c1a63a9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -145,16 +145,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    * mod_proxy: Persist balancer and worker data across restarts and stop/start.
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1387110
                   http://svn.apache.org/viewvc?view=revision&revision=1387444
-                  http://svn.apache.org/viewvc?view=revision&revision=1387603
-                  http://svn.apache.org/viewvc?view=revision&revision=1387684
-                  http://svn.apache.org/viewvc?view=revision&revision=1387691
                   http://svn.apache.org/viewvc?view=revision&revision=1387693
-                  http://svn.apache.org/viewvc?view=revision&revision=1388029
-                  http://svn.apache.org/viewvc?view=revision&revision=1388444
-                  http://svn.apache.org/viewvc?view=revision&revision=1388603
-     2.4.x patch: http://people.apache.org/~jim/patches/proxy-persist.diff
+     2.4.x patch: http://people.apache.org/~jim/patches/proxy-persist2.diff
      +1: jim
-     rjung: the combined 2.4 patch contains lots of unwanted "inherit" changes.
 
    * mod_proxy: Allow balancers to be server-specific, as they should have
      been. Inheritance causes too many behind-the-scene interactions