Commits
dimir authored 3c9ff01241aM
.......... [RSM-1] merge from 5.0.0 tag zabbix/master Conflicts: .gitignore ChangeLog configure.ac create/bin/export_data.sh create/src/data.tmpl create/src/schema.tmpl create/src/templates.tmpl frontends/php/app/views/monitoring.widget.trigover.view.php frontends/php/local/app/controllers/.gitignore frontends/php/local/app/partials/.gitignore frontends/php/local/app/views/.gitignore frontends/php/local/conf/.gitignore frontends/php/modules/.gitignore include/dbcache.h include/version.h include/zbxdb.h opt/zabbix/data/.gitignore opt/zabbix/sla/.gitignore src/go/pkg/version/version.go src/libs/zbxdb/db.c src/libs/zbxdbupgrade/dbupgrade_4050.c src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java src/zabbix_proxy/proxy.c src/zabbix_server/server.c ui/app/controllers/CControllerTimeSelectorUpdate.php ui/app/views/monitoring.widget.issues.view.php ui/app/views/monitoring.widget.trigover.view.php ui/conf/certs/.gitignore ui/conf/zabbix.conf.php.example ui/include/classes/api/services/CHost.php ui/include/classes/db/MysqlDbBackend.php ui/include/classes/db/SqliteDbBackend.php ui/include/classes/mvc/CRouter.php ui/include/defines.inc.php ui/include/views/general.script.execute.php ui/local/app/controllers/.gitignore ui/local/app/partials/.gitignore ui/local/app/views/.gitignore ui/local/conf/.gitignore ui/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd ui/vendor/xmlseclibs/LICENSE
Showing diff to4dcb9efcb1b