Commit Graph

234 Commits

Author SHA1 Message Date
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
55f5754a0a
Merge pull request #235 from zabbix/master
Fixed issue in ubuntu image
2018-02-22 13:03:33 +02:00
root
cfcad63159 Fixed issue in ubuntu image 2018-02-22 03:02:43 -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
e2aaf877bd Added v3 compose files 2018-02-20 06:35:32 -08:00
Alexey Pustovalov
5b31977138
Merge pull request #225 from zabbix/master
Added v3 compose files
2018-02-21 01:00:51 +02:00
root
67ed377c68 Added v3 compose files 2018-02-20 06:22:27 -08:00
Alexey Pustovalov
da882b535a
Merge pull request #221 from zabbix/master
Fixed issue with web-nginx-mysql image
2018-02-19 13:06:30 +02:00
Alexey Pustovalov
36e1fbcc44
Merge pull request #219 from zabbix/master
Master
2018-02-19 12:16:00 +02:00
Alexey Pustovalov
ad03db6f18
Merge pull request #212 from zabbix/master
Master
2018-02-19 12:04:09 +02:00
root
5ccac3cdf4 Fixed issue with web-nginx-mysql image 2018-02-17 17:10:43 -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
Alexey Pustovalov
e3dd845396
Merge branch '3.4' into master 2018-02-19 12:05:02 +02:00
root
461f869a4a Revert "Merge branch 'trunk' into master"
This reverts commit b643fe4890, reversing
changes made to 59f4e534f2.
2018-02-17 16:07:56 -08:00
Alexey Pustovalov
67bacc8cc4
Merge branch 'trunk' into master 2018-02-19 11:25:57 +02:00
Alexey Pustovalov
b643fe4890
Merge branch 'trunk' into master 2018-02-19 11:25:31 +02:00
root
2af6225916 Fixed issue with proxy-mysql image 2018-02-17 16:01:49 -08:00
root
59f4e534f2 Fixed issue with proxy-mysql image 2018-02-17 15:51:58 -08:00
root
745f51ee3a Fixed issue with proxy-mysql image 2018-02-17 15:49:51 -08:00
root
ab9fe9e98a Fixed issue with proxy-mysql image 2018-02-17 15:49:11 -08:00
root
2caa808dd4 Fixed issue with proxy-mysql image 2018-02-17 15:34:32 -08:00
root
755ea90c5f Fixed issue with proxy-mysql image 2018-02-17 15:33:38 -08:00
root
bfd8c019da CentOS image update 2018-02-17 12:12:44 -08:00
root
f81b71941a CentOS image update 2018-02-17 12:11:35 -08:00
root
0f7eb4e04f CentOS image update 2018-02-17 11:24:06 -08:00
Alexey Pustovalov
d21881ac08
Merge pull request #208 from zabbix/master
Updated Zabbix logo
2018-02-19 01:36:16 +02:00
root
a60fdb8a05 CentOS image update 2018-02-17 11:22:21 -08:00
Alexey Pustovalov
594b40be22
Merge pull request #205 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:11 +02:00
root
06e4fe7296 CentOS image update 2018-02-17 11:20:13 -08:00
Alexey Pustovalov
9f08c43b04
Merge pull request #206 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:30 +02:00
Alexey Pustovalov
66d68fd870
Merge pull request #201 from zabbix/master
Master
2018-02-19 01:04:32 +02:00
Alexey Pustovalov
e6c58f04a1 Update compose CentOS files 2018-02-18 23:11:00 +02:00
Alexey Pustovalov
ff2e320cee
Merge pull request #198 from zabbix/master
Master
2018-02-18 23:08:00 +02:00
Alexey Pustovalov
b2bb957389 Added Centos images 2018-02-18 22:45:33 +02:00
Alexey Pustovalov
67d50cacb3 The big one update :-) 2018-02-18 22:42:44 +02:00
root
ae0b7a95a0 Updated Zabbix logo 2018-02-17 11:12:25 -08:00
root
73b7f8662e Updated Zabbix logo 2018-02-17 11:00:15 -08:00
Alexey Pustovalov
25f50d485d
Merge pull request #204 from zabbix/master
Revert "Merge branch 'trunk' into master"
2018-02-19 01:14:49 +02:00
Alexey Pustovalov
30e3563b9d
Merge pull request #200 from zabbix/master
Master
2018-02-19 00:59:27 +02:00
Alexey Pustovalov
78b62d9ce5
Merge branch 'trunk' into master 2018-02-19 00:59:05 +02:00
root
b12db76155 Updated Zabbix logo 2018-02-17 10:51:57 -08:00
root
93d3ff421a Updated Zabbix logo 2018-02-17 10:51:12 -08:00
Alexey Pustovalov
c9f4250658
Merge pull request #203 from zabbix/master
Master
2018-02-19 01:11:55 +02:00
Alexey Pustovalov
053dc17493 Update compose CentOS files 2018-02-19 00:13:27 +02:00
Alexey Pustovalov
9091438f7e
Merge pull request #197 from zabbix/master
Master
2018-02-19 00:11:55 +02:00
Alexey Pustovalov
49a0e5deb7
Merge branch '3.4' into master 2018-02-19 00:10:51 +02: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
f4e4c3f70f Revert "Merge branch '3.4' into master"
This reverts commit 49a0e5deb7, reversing
changes made to b2bb957389.
2018-02-17 10:22:18 -08:00