projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2354 from rpv-tomsk/issue-2344-nut-rework
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
fb161af
..
6b59d4d
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-532,7
+532,6
@@
# <EAL>
# Coremask "0x1"
# MemoryChannels "4"
# <EAL>
# Coremask "0x1"
# MemoryChannels "4"
-# ProcessType "secondary"
# FilePrefix "rte"
# </EAL>
# <Event "link_status">
# FilePrefix "rte"
# </EAL>
# <Event "link_status">
@@
-554,7
+553,6
@@
# <EAL>
# Coremask "0x2"
# MemoryChannels "4"
# <EAL>
# Coremask "0x2"
# MemoryChannels "4"
-# ProcessType "secondary"
# FilePrefix "rte"
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
# FilePrefix "rte"
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
@@
-971,6
+969,7
@@
# ForceSSL true
# VerifyPeer true
# CAPath "/path/to/folder"
# ForceSSL true
# VerifyPeer true
# CAPath "/path/to/folder"
+# #ConnectTimeout 5000
#</Plugin>
#<Plugin olsrd>
#</Plugin>
#<Plugin olsrd>