Commit Graph

180 Commits

Author SHA1 Message Date
ac8647d1f3 Merge remote-tracking branch 'origin/master' into 3.2 2018-02-22 12:38:59 -08:00
2955fefc19 Fixed issue with missing iksemel package. It exists in EPEL only 2018-02-22 12:38:03 -08:00
a2879cb448 Merge pull request #239 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:10:58 +02:00
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
d0e79cbb24 Merge pull request #236 from zabbix/master
Fixed issue in ubuntu image
2018-02-22 13:03:50 +02:00
cfcad63159 Fixed issue in ubuntu image 2018-02-22 03:02:43 -08:00
82aaab3474 Merge pull request #230 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:02:06 +02:00
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
ff6a8681ed Added v3 compose files 2018-02-20 06:42:18 -08:00
7c50fc7899 Merge pull request #226 from zabbix/master
Added v3 compose files
2018-02-21 01:01:11 +02:00
67ed377c68 Added v3 compose files 2018-02-20 06:22:27 -08:00
8d407ae506 Merge pull request #222 from zabbix/master
Fixed issue with web-nginx-mysql image
2018-02-19 13:06:47 +02:00
acfc97ad92 Merge pull request #220 from zabbix/master
Master
2018-02-19 12:16:16 +02:00
3f23ee47fb Merge pull request #213 from zabbix/master
Master
2018-02-19 12:04:29 +02:00
5ccac3cdf4 Fixed issue with web-nginx-mysql image 2018-02-17 17:10:43 -08:00
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
e3dd845396 Merge branch '3.4' into master 2018-02-19 12:05:02 +02:00
461f869a4a Revert "Merge branch 'trunk' into master"
This reverts commit b643fe4890, reversing
changes made to 59f4e534f2.
2018-02-17 16:07:56 -08:00
67bacc8cc4 Merge branch 'trunk' into master 2018-02-19 11:25:57 +02:00
b643fe4890 Merge branch 'trunk' into master 2018-02-19 11:25:31 +02:00
839ced1364 Fixed issue with proxy-mysql image 2018-02-17 16:02:24 -08:00
59f4e534f2 Fixed issue with proxy-mysql image 2018-02-17 15:51:58 -08:00
745f51ee3a Fixed issue with proxy-mysql image 2018-02-17 15:49:51 -08:00
ab9fe9e98a Fixed issue with proxy-mysql image 2018-02-17 15:49:11 -08:00
2caa808dd4 Fixed issue with proxy-mysql image 2018-02-17 15:34:32 -08:00
755ea90c5f Fixed issue with proxy-mysql image 2018-02-17 15:33:38 -08:00
bfd8c019da CentOS image update 2018-02-17 12:12:44 -08:00
f81b71941a CentOS image update 2018-02-17 12:11:35 -08:00
0f7eb4e04f CentOS image update 2018-02-17 11:24:06 -08:00
d21881ac08 Merge pull request #208 from zabbix/master
Updated Zabbix logo
2018-02-19 01:36:16 +02:00
a60fdb8a05 CentOS image update 2018-02-17 11:22:21 -08:00
594b40be22 Merge pull request #205 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:11 +02:00
6103911359 CentOS image update 2018-02-17 11:21:26 -08:00
058b49c3cf Merge pull request #207 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:51 +02:00
ab3fce927c Merge pull request #202 from zabbix/master
Master
2018-02-19 01:04:58 +02:00
6ea36fa9d6 Update compose CentOS files 2018-02-18 23:14:56 +02:00
acfe3e7a2d Merge pull request #199 from zabbix/master
Master
2018-02-18 23:13:22 +02:00
b2bb957389 Added Centos images 2018-02-18 22:45:33 +02:00
67d50cacb3 The big one update :-) 2018-02-18 22:42:44 +02:00
ae0b7a95a0 Updated Zabbix logo 2018-02-17 11:12:25 -08:00
73b7f8662e Updated Zabbix logo 2018-02-17 11:00:15 -08:00
25f50d485d Merge pull request #204 from zabbix/master
Revert "Merge branch 'trunk' into master"
2018-02-19 01:14:49 +02:00
30e3563b9d Merge pull request #200 from zabbix/master
Master
2018-02-19 00:59:27 +02:00
78b62d9ce5 Merge branch 'trunk' into master 2018-02-19 00:59:05 +02:00
b12db76155 Updated Zabbix logo 2018-02-17 10:51:57 -08:00
93d3ff421a Updated Zabbix logo 2018-02-17 10:51:12 -08:00
c9f4250658 Merge pull request #203 from zabbix/master
Master
2018-02-19 01:11:55 +02:00
053dc17493 Update compose CentOS files 2018-02-19 00:13:27 +02:00
9091438f7e Merge pull request #197 from zabbix/master
Master
2018-02-19 00:11:55 +02:00
49a0e5deb7 Merge branch '3.4' into master 2018-02-19 00:10:51 +02:00