Merge branch 'collectd-5.8'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)
Conflicts:
src/collectd.conf.pod

src/collectd.conf.pod

index e45ae3d..ef79f88 100644 (file)
@@ -6880,8 +6880,8 @@ B<Synopsis:>
    </Process>
    <ProcessMatch "name" "regex">
      CollectFileDescriptor false
-     CollectContextSwitch  true
-   </Process>
+     CollectContextSwitch true
+   </ProcessMatch>
  </Plugin>
 
 =over 4