Commit Graph

206 Commits

Author SHA1 Message Date
a7a45ad4ee Merge pull request #267 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-31 00:05:52 +03:00
fc0cce07ef Merge pull request #264 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-30 17:48:31 +03:00
f4aa02c0b9 Fixed small issues. Preparation for Appliance 2018-03-30 06:15:14 -07:00
7c7635c388 Fixed small issues. Preparation for Appliance 2018-03-30 02:58:25 -07:00
becbfbaefd Zabbix 3.0.15 appliance 2018-03-30 01:49:10 -07:00
b6821475c1 Merge pull request #262 from zabbix/master
Master
2018-03-30 16:36:06 +03:00
2f8752ac1c Fixed small issues. Preparation for Appliance 2018-03-30 01:36:04 -07:00
fb6866403c Fixed small issues. Preparation for Appliance 2018-03-29 07:21:02 -07:00
9665660e09 Merge pull request #257 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-29 16:53:24 +03:00
6e7a247564 Fixed small issues. Preparation for Appliance 2018-03-29 06:28:10 -07:00
17a29083cf Zabbix 3.0.15 release 3.0.15 2018-02-26 02:37:43 -08:00
cd2a3a0627 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-23 13:48:40 -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
428e64e7e9 Merge remote-tracking branch 'origin/master' into 3.0 3.0.14 2018-02-22 14:37:22 -08:00
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
d61f132b80 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 13:30:02 -08:00
20271e6592 Fixed issue with supervisord daemon on Nginx Ubuntu images 2018-02-22 13:29:41 -08:00
8e36252f50 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 12:54:07 -08:00
e274af43ee Fixed issue with missing https in apt 2018-02-22 12:53:52 -08:00
292a2427d8 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 12:38:20 -08:00
2955fefc19 Fixed issue with missing iksemel package. It exists in EPEL only 2018-02-22 12:38:03 -08:00
f1800bb057 Merge pull request #238 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:09:45 +02:00
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
55f5754a0a Merge pull request #235 from zabbix/master
Fixed issue in ubuntu image
2018-02-22 13:03:33 +02:00
cfcad63159 Fixed issue in ubuntu image 2018-02-22 03:02:43 -08:00
b0b2e073ec Merge pull request #229 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:01:40 +02:00
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
e2aaf877bd Added v3 compose files 2018-02-20 06:35:32 -08:00
5b31977138 Merge pull request #225 from zabbix/master
Added v3 compose files
2018-02-21 01:00:51 +02:00
67ed377c68 Added v3 compose files 2018-02-20 06:22:27 -08:00
da882b535a Merge pull request #221 from zabbix/master
Fixed issue with web-nginx-mysql image
2018-02-19 13:06:30 +02:00
36e1fbcc44 Merge pull request #219 from zabbix/master
Master
2018-02-19 12:16:00 +02:00
ad03db6f18 Merge pull request #212 from zabbix/master
Master
2018-02-19 12:04:09 +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
2af6225916 Fixed issue with proxy-mysql image 2018-02-17 16:01:49 -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