From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 20 Dec 2008 09:17:26 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.2~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=074b4980bc75bea6826e6a38dcc6e193a721b2a8

Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

	src/utils_dns.c
---

074b4980bc75bea6826e6a38dcc6e193a721b2a8
diff --cc src/utils_dns.c
index c16ca52c,5316a71a..c16b3c12
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@@ -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>