Commit Graph

224 Commits

Author SHA1 Message Date
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
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
06e4fe7296 CentOS image update 2018-02-17 11:20:13 -08:00
9f08c43b04 Merge pull request #206 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:30 +02:00
66d68fd870 Merge pull request #201 from zabbix/master
Master
2018-02-19 01:04:32 +02:00
e6c58f04a1 Update compose CentOS files 2018-02-18 23:11:00 +02:00
ff2e320cee Merge pull request #198 from zabbix/master
Master
2018-02-18 23:08:00 +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
8f39e80b6f Revert "Merge branch 'trunk' into master"
This reverts commit 78b62d9ce5, reversing
changes made to f4e4c3f70f.
2018-02-17 10:38:49 -08:00
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
04af542f09 Updated Kubernetes yaml 2018-02-13 07:06:01 -08:00
ea13bc8221 Updated Kubernetes yaml 2018-02-13 07:03:43 -08:00
b24419bca6 Updated Kubernetes yaml 2018-02-13 07:02:17 -08:00
4175d235fd Merge pull request #194 from zabbix/master
Master
2018-02-13 16:59:13 +02:00
48cd71ae74 Merge pull request #193 from zabbix/master
Master
2018-02-13 16:58:49 +02:00
1c12c22ca7 Merge pull request #191 from zabbix/master
Master
2018-02-13 16:58:03 +02:00
3b7cc92f9b Updated Zabbix logo 2018-02-13 06:35:37 -08:00
bf1ce42d35 Added kubernetes yaml file 2018-02-13 06:34:08 -08:00
e212ec751b Zabbix 3.4.6 release 2018-01-16 20:04:34 +02:00
2948c37084 Zabbix 3.0.14 release 2018-01-04 21:21:25 +02:00