---------------------
PatchSet 11569 
Date: 2007/08/16 23:51:13
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Bug #2052: cache_peer carp documentation update

The CARP notes still mentioned the defunct carp-load-factor option. Now removed.

In Squid-2.6 CARP uses weight just as any other weighted peering method.

Members: 
	doc/release-notes/release-2.6.sgml:1.61->1.62 
	src/cf.data.pre:1.409->1.410 

Index: squid/doc/release-notes/release-2.6.sgml
===================================================================
RCS file: /cvsroot/squid/squid/doc/release-notes/release-2.6.sgml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- squid/doc/release-notes/release-2.6.sgml	15 Jul 2007 14:10:49 -0000	1.61
+++ squid/doc/release-notes/release-2.6.sgml	16 Aug 2007 23:51:13 -0000	1.62
@@ -2,7 +2,7 @@
 <article>
 <title>Squid 2.6.STABLE14 release notes</title>
 <author>Squid Developers</author>
-<date>$Id: release-2.6.sgml,v 1.61 2007/07/15 14:10:49 hno Exp $</date>
+<date>$Id: release-2.6.sgml,v 1.62 2007/08/16 23:51:13 hno Exp $</date>
 
 <abstract>
 This document contains the release notes for version 2.6 of Squid.
@@ -77,7 +77,7 @@
 <item>Selective access logging, and ability to log to more than access log possibly in different formats
 <item>New more efficient helper protocol allowing for multiple concurrent lookups to the same helper
 <item>Ability to rewrite Location headers (redirects sent by servers)
-<item>
+<item>Major cleanup or CARP. Now plays well with the other peering algorithms as just another non-ICP peering method.
 </itemize>
 
 <sect>Changes to squid.conf
@@ -135,6 +135,7 @@
 <tag>wccp2_weight</tag>Cache server load weigth in the cluster. (2.6.STABLE4)
 <tag>check_hostnames</tag>Control if Squid should check the sanity of host names before trying to look them up in DNS
 <tag>allow_underscores</tag>Control if _ is to be considered a valid character in hostnames or not
+<tag>cache_peer carp-load-factor</tag>Option removed. CARP now uses the weight parameter instead.
 </descrip>
 
 <sect>Known issues
Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- squid/src/cf.data.pre	14 Aug 2007 03:46:22 -0000	1.409
+++ squid/src/cf.data.pre	16 Aug 2007 23:51:13 -0000	1.410
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.409 2007/08/14 03:46:22 amosjeffries Exp $
+# $Id: cf.data.pre,v 1.410 2007/08/16 23:51:13 hno Exp $
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -414,7 +414,6 @@
 		     max-conn=n
 		     htcp
 		     htcp-oldsquid
-		     carp-load-factor
 		     originserver
 		     userhash
 		     sourcehash
@@ -544,11 +543,6 @@
 
 		     use 'htcp-oldsquid' to send HTCP to old Squid versions
 
-		     use 'carp-load-factor=f' to define a parent
-		     cache as one participating in a CARP array.
-		     The 'f' values for all CARP parents must add
-		     up to 1.0.
-
 		     'originserver' causes this parent peer to be contacted as
 		     a origin server. Meant to be used in accelerator setups.