r4672 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/doc varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl

[tfheen at varnish-cache.org]

Author: tfheen
Date: 2010-04-19 12:26:23 +0200 (Mon, 19 Apr 2010)
New Revision: 4672

Modified:
   branches/2.1/
   branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
   branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
   branches/2.1/varnish-cache/bin/varnishd/vparam.h
   branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
   branches/2.1/varnish-cache/doc/changes-2.0.6-2.1.0.xml
   branches/2.1/varnish-cache/include/vct.h
   branches/2.1/varnish-cache/include/vev.h
   branches/2.1/varnish-cache/lib/libvarnish/tcp.c
   branches/2.1/varnish-cache/lib/libvarnish/vev.c
   branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
Log:
Merge r4643: Fix syntax errors, add some more changes




Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:4637,4640
   + /trunk:4637,4640,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637
   + /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637
   + /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishd/vparam.h:4637
   + /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637
   + /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637
   + /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637
   + /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637
   + /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643

Modified: branches/2.1/varnish-cache/doc/changes-2.0.6-2.1.0.xml
===================================================================
--- branches/2.1/varnish-cache/doc/changes-2.0.6-2.1.0.xml	2010-04-19 10:19:46 UTC (rev 4671)
+++ branches/2.1/varnish-cache/doc/changes-2.0.6-2.1.0.xml	2010-04-19 10:26:23 UTC (rev 4672)
@@ -48,7 +48,7 @@
       <para>When closing connections, we experimented with sending RST
       to free up load balancers and free up threads more quickly.
       This caused some problems with NAT routers and so has been
-      reverted for now.
+      reverted for now.</para>
     </change>
 
     <change type="enh">
@@ -176,7 +176,7 @@
 
     <change type="enh">
       <para><code>purge.hash</code> is now deprecated and no longer
-      shown in help listings.</code>.</para>
+      shown in help listings.</para>
     </change>
 
     <change type="enh" ref="607">
@@ -298,11 +298,19 @@
       <para>Exit at the end of the file when started
 	with <code>-d</code>.</para>
     </change>
+  </subsystem>
 
+  <subsystem>
+    <name>varnishadm</name>
 
-varnishadm:
- - timeout support
- - secret support
- - handle cli banner
+    <change type="enh">
+      <para><code>varnishadm</code> can now have a timeout when trying
+      to connect to the running <code>varnishd</code>.</para>
+    </change>
 
+    <change type="enh">
+      <para><code>varnishadm</code> now knows how to respond to the
+      secret from a secured <code>varnishd</code></para>
+    </change>
+  </subsystem>
 </group>


Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/include/vct.h:4637
   + /trunk/varnish-cache/include/vct.h:4637,4643


Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/include/vev.h:4637
   + /trunk/varnish-cache/include/vev.h:4637,4643


Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/lib/libvarnish/tcp.c:4637
   + /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643


Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/lib/libvarnish/vev.c:4637
   + /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643


Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637
   + /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643