Commit Graph

66 Commits

Author SHA1 Message Date
Alexey Pustovalov
f6e90789a9
Merge pull request #260 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-29 16:54:52 +03:00
root
6e7a247564 Fixed small issues. Preparation for Appliance 2018-03-29 06:28:10 -07:00
root
26ba6ae137 Merge remote-tracking branch 'origin/master' into trunk 2018-02-23 13:49:47 -08:00
root
de98c6bbd8 Escpaing special characters 2018-02-23 13:43:00 -08:00
root
fc85c2c687 Merge remote-tracking branch 'origin/master' into trunk 2018-02-22 14:38:27 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
root
2dbef36163 Removed supervisord from single application images 2018-02-22 12:31:38 -08:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
d6677fabf9
Merge pull request #232 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:02:52 +02:00
root
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
root
08e0021858 New config parameters since Zabbix 3.4 2018-02-18 02:11:27 -08:00
root
0b7127d2f3 Fixed issue with proxy-mysql image 2018-02-17 16:20:18 -08: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
a60fdb8a05 CentOS image update 2018-02-17 11:22:21 -08:00
root
ae0b7a95a0 Updated Zabbix logo 2018-02-17 11:12:25 -08:00
Alexey Pustovalov
b2bb957389 Added Centos images 2018-02-18 22:45:33 +02:00