r1261 - in branches/1.0: . redhat

[des at projects.linpro.no]

Author: des
Date: 2007-02-20 09:47:02 +0100 (Tue, 20 Feb 2007)
New Revision: 1261

Modified:
   branches/1.0/
   branches/1.0/redhat/varnish.initrc
Log:
 r36059 at cat (orig r1243):  des | 2007-02-20 09:46:24 +0100
 Correct misunderstanding regarding -w.



Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
   - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1240
   + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1243

Modified: branches/1.0/redhat/varnish.initrc
===================================================================
--- branches/1.0/redhat/varnish.initrc	2007-02-20 08:47:01 UTC (rev 1260)
+++ branches/1.0/redhat/varnish.initrc	2007-02-20 08:47:02 UTC (rev 1261)
@@ -21,11 +21,9 @@
 		-f ${VARNISH_VCL_CONF} \
 		-T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
 		-t ${VARNISH_TTL} \
+		-w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \
 		-s ${VARNISH_BACKEND_STORAGE}"	
 
-# Note: The set of working threads is temporary broken in varnish-1.0.2.
-# This will be fixed in an upcoming release
-#		-w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \
 
 mkdir -p /var/run/varnish 2>/dev/null