r2567 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2008-03-08 15:01:28 +0100 (Sat, 08 Mar 2008)
New Revision: 2567

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache_cli.c
   branches/1.2/bin/varnishd/cache_pool.c
   branches/1.2/bin/varnishd/varnishd.1
Log:
Merged revisions 2467,2495-2499,2503-2505,2522-2524,2545,2563-2565 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2467 | phk | 2008-02-15 11:01:19 +0100 (Fri, 15 Feb 2008) | 2 lines
  
  remove the undocumented and unimplemented dump.pool command
........
  r2565 | des | 2008-03-08 14:47:56 +0100 (Sat, 08 Mar 2008) | 2 lines
  
  dump.pool was removed a while ago.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321-2327,2337,2358,2362-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2492-2494,2500-2502
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321-2327,2337,2358,2362-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2522-2524,2545,2563-2565

Modified: branches/1.2/bin/varnishd/cache_cli.c
===================================================================
--- branches/1.2/bin/varnishd/cache_cli.c	2008-03-08 13:51:54 UTC (rev 2566)
+++ branches/1.2/bin/varnishd/cache_cli.c	2008-03-08 14:01:28 UTC (rev 2567)
@@ -75,10 +75,6 @@
 	{ CLI_VCL_DISCARD,	cli_func_config_discard },
 	{ CLI_VCL_USE,		cli_func_config_use },
 
-	/* Undocumented */
-	{ "dump.pool", "dump.pool",
-	    "\tDump the worker thread pool state\n",
-	    0, 0, cli_func_dump_pool },
 	{ NULL }
 };
 

Modified: branches/1.2/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.2/bin/varnishd/cache_pool.c	2008-03-08 13:51:54 UTC (rev 2566)
+++ branches/1.2/bin/varnishd/cache_pool.c	2008-03-08 14:01:28 UTC (rev 2567)
@@ -433,14 +433,3 @@
 	AZ(pthread_create(&tp, NULL, wrk_reaperthread, NULL));
 	AZ(pthread_detach(tp));
 }
-
-/*--------------------------------------------------------------------*/
-
-void
-cli_func_dump_pool(struct cli *cli, const char * const *av, void *priv)
-{
-
-	(void)cli;
-	(void)av;
-	(void)priv;
-}

Modified: branches/1.2/bin/varnishd/varnishd.1
===================================================================
--- branches/1.2/bin/varnishd/varnishd.1	2008-03-08 13:51:54 UTC (rev 2566)
+++ branches/1.2/bin/varnishd/varnishd.1	2008-03-08 14:01:28 UTC (rev 2567)
@@ -28,7 +28,7 @@
 .\"
 .\" $Id$
 .\"
-.Dd July 20, 2007
+.Dd March 8, 2008
 .Dt VARNISHD 1
 .Os
 .Sh NAME
@@ -285,7 +285,6 @@
 address and port.
 The following commands are available:
 .Bl -tag -width 4n
-.It Cm dump.pool
 .It Cm help
 Display a list of available commands.
 .It Cm param.set Ar param Ar value