12 Commits

Author	SHA1	Message	Date
root	0653f8390b	Merge from master	2018-05-10 19:11:24 -07:00
root	c3e713a323	Updated Zabbix compose files to support Zabbix snmptraps based on different images (Alpine, CentOS)	2018-05-10 13:47:09 -07:00
root	1be4813733	Revert "Merge branch '3.4' into master" ... This reverts commit e3dd845396, reversing changes made to 461f869a4a.	2018-02-17 16:12:34 -08:00
root	93d3ff421a	Updated Zabbix logo	2018-02-17 10:51:12 -08:00
root	8f39e80b6f	Revert "Merge branch 'trunk' into master" ... This reverts commit 78b62d9ce5, reversing changes made to f4e4c3f70f.	2018-02-17 10:38:49 -08:00
root	b011c4d16d	Fixed MySQL user creation	2017-10-27 19:05:18 +03:00
Alexey Pustovalov	b626f3005e	Merge pull request #153 from zabbix/master ... Master	2017-10-21 17:16:47 +03:00
root	d249584c99	Fixed issue with non UTF-8 symbols on MySQL for proxies	2017-10-20 18:01:12 +03:00
Alexey Pustovalov	7bcf1be0ea	Merge pull request #59 from zabbix/master ... Added Apache with PostgreSQL support image	2016-10-28 16:54:24 +03:00
dotneft	1f208172b9	Added Apache with PostgreSQL support image	2016-10-28 06:49:42 -07:00
dotneft	0a9e47765f	Update compose files	2016-08-13 19:11:28 -07:00
dotneft	66e9ff253e	Added compose files for 2.0	2016-08-11 14:16:42 -07:00