From: Andrew Bays <andrew.bays@gmail.com>
Date: Wed, 4 Sep 2019 17:12:23 +0000 (-0400)
Subject: Fix merge conflicts
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=eb6f39121fa48db23021d0089bbbdd4616a8cccc;hp=66cef1318ab9f8666810ac763172f8a9bccfe776;p=collectd.git

Fix merge conflicts
---

diff --git a/AUTHORS b/AUTHORS
index a271a5e5..81378c23 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,9 +63,12 @@ Andrew Bays <abays at redhat.com>
 Andy Parkins <andyp at fussylogic.co.uk>
  - battery plugin: sysfs code.
 
+Aneesh Puttur <aputtur at redhat.com>
+ - connectivity plugin.
+
 Andy Smith <ansmith at redhat.com>
  - AMQP 1.0 plugin.
- 
+
 Aneesh Puttur <aputtur at redhat.com>
  - connectivity plugin.
 
diff --git a/configure.ac b/configure.ac
index d05cc80c..141a8da2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6793,7 +6793,7 @@ AC_PLUGIN([bind],                [$plugin_bind],              [ISC Bind nameserv
 AC_PLUGIN([ceph],                [$plugin_ceph],              [Ceph daemon statistics])
 AC_PLUGIN([cgroups],             [$plugin_cgroups],           [CGroups CPU usage accounting])
 AC_PLUGIN([chrony],              [yes],                       [Chrony statistics])
-AC_PLUGIN([connectivity],        [$with_libmnl],              [Network interface up/down statistics])
+AC_PLUGIN([connectivity],        [$plugin_connectivity],      [Network interface up/down events])
 AC_PLUGIN([conntrack],           [$plugin_conntrack],         [nf_conntrack statistics])
 AC_PLUGIN([contextswitch],       [$plugin_contextswitch],     [context switch statistics])
 AC_PLUGIN([cpu],                 [$plugin_cpu],               [CPU usage statistics])