From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 13 Jan 2007 15:47:15 +0000 (+0100)
Subject: Merge branch 'master' into ff/plugins-ng
X-Git-Tag: collectd-4.0.0~243
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=f179018be96e1e1aea25d4928bdaf100a9a92a7d

Merge branch 'master' into ff/plugins-ng

Conflicts:

	src/collectd.c
	src/network.c
---

f179018be96e1e1aea25d4928bdaf100a9a92a7d
diff --cc src/collectd.c
index 6ffb7c39,a93cc286..e1306477
--- a/src/collectd.c
+++ b/src/collectd.c
@@@ -222,9 -223,6 +222,8 @@@ static int start_client (void
  #if HAVE_LIBRRD
  static int start_server (void)
  {
- 	/* FIXME use stack here! */
 +	/* FIXME */
 +#if 0
  	char *host;
  	char *type;
  	char *instance;