Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100)
Conflicts:

src/utils_dns.c

1  2 
src/collectd.c
src/collectd.conf.in
src/collectd.conf.pod
src/common.c
src/email.c
src/ipmi.c
src/rrdtool.c
src/unixsock.c
src/utils_dns.c

diff --cc src/collectd.c
Simple merge
Simple merge
Simple merge
diff --cc src/common.c
Simple merge
diff --cc src/email.c
Simple merge
diff --cc src/ipmi.c
Simple merge
diff --cc src/rrdtool.c
Simple merge
diff --cc src/unixsock.c
Simple merge
diff --cc src/utils_dns.c
index c16ca52c4380abe196937806225560bd392c457e,5316a71aefc6bae6bb840e4616013146a37384ff..c16b3c12f78d6530443aedcc65ae6be2a1024768
@@@ -34,7 -34,7 +34,8 @@@
   */
  
  #include "collectd.h"
+ #include "plugin.h"
 +#include "common.h"
  
  #if HAVE_NETINET_IN_SYSTM_H
  # include <netinet/in_systm.h>