Commit Graph

1348 Commits

Author SHA1 Message Date
26ba6ae137 Merge remote-tracking branch 'origin/master' into trunk 2018-02-23 13:49:47 -08:00
de98c6bbd8 Escpaing special characters 2018-02-23 13:43:00 -08:00
30ed00f5b0 Removed unused files 2018-02-23 01:46:37 -08:00
fc85c2c687 Merge remote-tracking branch 'origin/master' into trunk 2018-02-22 14:38:27 -08:00
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
8603e1b2e5 Merge remote-tracking branch 'origin/master' into trunk 2018-02-22 13:31:28 -08:00
20271e6592 Fixed issue with supervisord daemon on Nginx Ubuntu images 2018-02-22 13:29:41 -08:00
637a44ebc1 Merge remote-tracking branch 'origin/master' into trunk 2018-02-22 12:55:42 -08:00
e274af43ee Fixed issue with missing https in apt 2018-02-22 12:53:52 -08:00
ea3cbb7c8d Merge remote-tracking branch 'origin/master' into trunk 2018-02-22 12:39:42 -08:00
2955fefc19 Fixed issue with missing iksemel package. It exists in EPEL only 2018-02-22 12:38:03 -08:00
2dbef36163 Removed supervisord from single application images 2018-02-22 12:31:38 -08:00
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
d9ffdc0937 Merge pull request #237 from zabbix/master
Fixed issue in ubuntu image
2018-02-22 13:04:06 +02:00
cfcad63159 Fixed issue in ubuntu image 2018-02-22 03:02:43 -08:00
d6677fabf9 Merge pull request #232 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:02:52 +02:00
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
bef37e5715 Updated docker compose variables 2018-02-20 06:50:59 -08:00
8af278c2cc Added v3 compose files 2018-02-20 06:44:19 -08:00
cd441102d4 Merge pull request #228 from zabbix/master
Added v3 compose files
2018-02-21 01:01:46 +02:00
67ed377c68 Added v3 compose files 2018-02-20 06:22:27 -08:00
08e0021858 New config parameters since Zabbix 3.4 2018-02-18 02:11:27 -08:00
4190605b57 Updated agent alpine 2018-02-17 23:32:01 -08:00
fbd7807667 Fixed issue with agent image 2018-02-17 18:03:28 -08:00
d72c40b3d1 Merge pull request #224 from zabbix/master
Fixed issue with web-nginx-mysql image
2018-02-19 13:07:27 +02:00
5ccac3cdf4 Fixed issue with web-nginx-mysql image 2018-02-17 17:10:43 -08:00
0b7127d2f3 Fixed issue with proxy-mysql image 2018-02-17 16:20:18 -08:00
c8669d269b Merge pull request #218 from zabbix/master
Master
2018-02-19 12:13:47 +02:00
53b81cb9a0 Merge pull request #211 from zabbix/revert-210-master
Revert "Fixed issue with proxy-mysql image"
2018-02-19 11:28:44 +02:00
793cb4ca26 Revert "Fixed issue with proxy-mysql image" 2018-02-19 11:28:32 +02:00
6c59923fe8 Merge pull request #210 from zabbix/master
Fixed issue with proxy-mysql image
2018-02-19 11:26:59 +02: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
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
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
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