Commit Graph

11 Commits

Author SHA1 Message Date
root
6a9d8dfbc7 Merge remote-tracking branch 'origin/master' into 3.2 2018-02-22 14:37:41 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
Alexey Pustovalov
a2879cb448
Merge pull request #239 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:10:58 +02:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
82aaab3474
Merge pull request #230 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:02:06 +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
a60fdb8a05 CentOS image update 2018-02-17 11:22:21 -08:00
root
6103911359 CentOS image update 2018-02-17 11:21:26 -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