Merge remote-tracking branch 'origin/zabbix'

e2fd38dc · Cédric de Saint Martin · 7d430e6e · 6896fd4a · e2fd38dc
Commit e2fd38dc authored Aug 20, 2014 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in +1 -0

No files found.
--- a/slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in
+++ b/slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in
@@ -197,6 +197,7 @@ ListenIP=%(ip)s
 # Range: 1-30
 # Default:
 # Timeout=3
+Timeout=15
 ### Option: Include
 #	You may include individual files or all files in a directory in the configuration file.