Commit Graph

12 Commits

Author SHA1 Message Date
root
428e64e7e9 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 14:37:22 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
Alexey Pustovalov
f1800bb057
Merge pull request #238 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:09:45 +02:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
b0b2e073ec
Merge pull request #229 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:01:40 +02:00
root
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23: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
f81b71941a CentOS image update 2018-02-17 12:11:35 -08:00
root
a60fdb8a05 CentOS image update 2018-02-17 11:22:21 -08:00
root
06e4fe7296 CentOS image update 2018-02-17 11:20:13 -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