diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2022-09-19 16:31:15 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2022-09-19 16:31:15 +0300 |
| commit | 6fed6ddf908c0b0b7197a223bc1d4215d42694a2 (patch) | |
| tree | 87e72ce9a349294ad527fb817fc58c0c977c572a /conf | |
| parent | 9a6a0d184be443a538bdbe706a0ae76a91008e4c (diff) | |
| parent | 5b9ab82fe550a7c87763703ab4a7320c69aaf9bb (diff) | |
.......... [ZBXNEXT-3290] merged branch 'master' of ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-3290-6.3
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_proxy.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index be1021f7f74..dd22c9b2c1d 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -232,6 +232,7 @@ DBUser=zabbix # Default: # ProxyOfflineBuffer=1 +<<<<<<< HEAD ### Option: HeartbeatFrequency # Frequency of heartbeat messages in seconds. # Used for monitoring availability of Proxy on server side. |