------------------------------------------------------------
revno: 12521
revision-id: squid3@treenet.co.nz-20130329055755-8y9bsm4utwdlcm68
parent: squid3@treenet.co.nz-20130329055646-f11tzb5neai6iqu9
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3774
author: Alexandre Chappaz <alexandrechappaz@gmail.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Thu 2013-03-28 23:57:55 -0600
message:
  Bug 3774: -k reconfigure drops rock
  
  This fix keeps Rock cache_dirs visible to Cache Manager after reconfigure.
  We still lack proper support for complex reconfiguration changes involving
  cache_dirs.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130329055755-8y9bsm4utwdlcm68
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 108074cd0e4b8f212191b3a943718a187419ee69
# timestamp: 2013-03-29 06:00:19 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130329055646-\
#   f11tzb5neai6iqu9
# 
# Begin patch
=== modified file 'src/cache_cf.cc'
--- src/cache_cf.cc	2013-02-14 07:34:42 +0000
+++ src/cache_cf.cc	2013-03-29 05:57:55 +0000
@@ -655,6 +655,7 @@
     memConfigure();
     /* Sanity checks */
 
+    Config.cacheSwap.n_strands = 0; // no diskers by default
     if (Config.cacheSwap.swapDirs == NULL) {
         /* Memory-only cache probably in effect. */
         /* turn off the cache rebuild delays... */