Commits
dimir authored 17a5b79fbfbM
.......... [RSM-1] 966: merged with Zabbix 7.0.0 Resolved conflicts: create/src/schema.tmpl include/zbxcacheconfig.h src/libs/zbxcacheconfig/dbconfig.c src/libs/zbxcacheconfig/dbconfig.h src/libs/zbxcacheconfig/dbconfig_dump.c src/libs/zbxcachehistory/cachehistory.c src/libs/zbxcomms/tls.c src/libs/zbxdbupgrade/dbupgrade.h src/zabbix_proxy/Makefile.am src/zabbix_proxy/proxy.c src/zabbix_server/Makefile.am src/zabbix_server/server.c ui/conf/zabbix.conf.php.example ui/include/classes/api/services/CHost.php ui/include/classes/validators/CApiInputValidator.php ui/include/defines.inc.php ui/tests/selenium/SeleniumTests.php
Showing diff to59548128364