projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b6af454
)
Merge branch 'collectd-5.8'
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000
(12:27 +0200)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000
(12:27 +0200)
Conflicts:
src/collectd.conf.pod
src/collectd.conf.pod
patch
|
blob
|
history
diff --git
a/src/collectd.conf.pod
b/src/collectd.conf.pod
index
e45ae3d
..
ef79f88
100644
(file)
--- 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
+ </Process
Match
>
</Plugin>
=over 4