From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 2 May 2018 10:27:01 +0000 (+0200)
Subject: Merge branch 'collectd-5.8'
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ca6d2f62d82ba4d07d6f266e3abbe1c0230d2f5a;hp=b6af45453fa718f8c3bd57b88cd90298bd52c444;p=collectd.git

Merge branch 'collectd-5.8'

Conflicts:
	src/collectd.conf.pod
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index e45ae3d8..ef79f88f 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -6880,8 +6880,8 @@ B<Synopsis:>
    </Process>
    <ProcessMatch "name" "regex">
      CollectFileDescriptor false
-     CollectContextSwitch  true
-   </Process>
+     CollectContextSwitch true
+   </ProcessMatch>
  </Plugin>
 
 =over 4