Commit Graph

116 Commits

Author SHA1 Message Date
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
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
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
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
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
root
04af542f09 Updated Kubernetes yaml 2018-02-13 07:06:01 -08:00
root
b24419bca6 Updated Kubernetes yaml 2018-02-13 07:02:17 -08:00
Alexey Pustovalov
4175d235fd
Merge pull request #194 from zabbix/master
Master
2018-02-13 16:59:13 +02:00
Alexey Pustovalov
48cd71ae74
Merge pull request #193 from zabbix/master
Master
2018-02-13 16:58:49 +02:00
root
3b7cc92f9b Updated Zabbix logo 2018-02-13 06:35:37 -08:00
root
bf1ce42d35 Added kubernetes yaml file 2018-02-13 06:34:08 -08:00
root
e212ec751b Zabbix 3.4.6 release 2018-01-16 20:04:34 +02:00
root
5160cf3c02 Zabbix 3.4.5 release 2018-01-04 21:20:26 +02:00
root
19dc7d69e7 Zabbix 3.4.4 release 2017-11-09 15:43:26 +02:00
root
8ebd6b050d Fixed trunk compilation 2017-10-27 22:44:30 +03:00
root
b011c4d16d Fixed MySQL user creation 2017-10-27 19:05:18 +03:00
Alexey Pustovalov
bc8ec55a9e
Merge pull request #165 from zabbix/master
Fixed MySQL user creation
2017-10-27 18:53:57 +03:00
root
3bbbdeff92 Fixed MySQL user creation 2017-10-27 18:53:31 +03:00
root
4f481f811e Fixed MySQL user creation 2017-10-27 18:51:39 +03:00
Alexey Pustovalov
ee3db75fb3 Merge pull request #160 from zabbix/master
Fixed issue with SNMP MIBs
2017-10-26 16:56:08 +03:00
root
9a330b035c Fixed issue with SNMP MIBs 2017-10-26 16:55:22 +03:00
root
38a27687c5 Fixed version for zabbix-web-apache-pgsql image in docker-compose reciept 2017-10-21 18:18:18 +03:00
Alexey Pustovalov
94e8a71894 Merge pull request #157 from zabbix/master
Fixed issue with sender and get in case of proxy and server images
2017-10-21 17:51:31 +03:00
root
098b780b90 Fixed issue with sender and get in case of proxy and server images 2017-10-21 17:51:02 +03:00
root
3b989be95f Zabbix 3.4.3 release 2017-10-21 17:34:03 +03:00