Commit Graph

101 Commits

Author SHA1 Message Date
root
428e64e7e9 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 14:37:22 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
Alexey Pustovalov
f1800bb057
Merge pull request #238 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:09:45 +02:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
b0b2e073ec
Merge pull request #229 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:01:40 +02:00
root
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
root
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
root
2af6225916 Fixed issue with proxy-mysql image 2018-02-17 16:01:49 -08:00
root
745f51ee3a Fixed issue with proxy-mysql image 2018-02-17 15:49:51 -08:00
Alexey Pustovalov
ff2e320cee
Merge pull request #198 from zabbix/master
Master
2018-02-18 23:08:00 +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
93d3ff421a Updated Zabbix logo 2018-02-17 10:51:12 -08: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
Alexey Pustovalov
78b62d9ce5
Merge branch 'trunk' into master 2018-02-19 00:59:05 +02: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
Alexey Pustovalov
49a0e5deb7
Merge branch '3.4' into master 2018-02-19 00:10:51 +02:00
root
e212ec751b Zabbix 3.4.6 release 2018-01-16 20:04:34 +02:00
root
2948c37084 Zabbix 3.0.14 release 2018-01-04 21:21:25 +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
b2ca042eee Zabbix 3.0.13 release 2017-11-09 15:40:17 +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
4fb4158517
Merge pull request #166 from zabbix/master
Fixed MySQL user creation
2017-10-27 18:54:20 +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
be8c034305 Merge pull request #161 from zabbix/master
Fixed issue with SNMP MIBs
2017-10-26 16:56:32 +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
Alexey Pustovalov
1d82c7acee Merge pull request #158 from zabbix/master
Fixed issue with sender and get in case of proxy and server images
2017-10-21 17:51:48 +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
root
0f943d01f5 Zabbix 3.0.12 release 2017-10-21 17:31:55 +03:00
Alexey Pustovalov
db0db59d0a Merge pull request #154 from zabbix/master
Master
2017-10-21 17:17:10 +03:00
Alexey Pustovalov
972ddcd67a Merge pull request #152 from zabbix/master
Master
2017-10-21 17:16:14 +03:00
root
269de962ec Added zabbix_get and zabbix_sender utilities to agent, proxy and server containers 2017-10-21 17:06:05 +03:00
root
a7d9831ebf Fixed issue with non UTF-8 symbols in build scripts 2017-10-20 18:06:22 +03:00
root
a2ab1a9bfd Zabbix 3.4.2 release 2017-10-12 20:33:53 +03:00
root
3e03235c40 Zabbix 3.4.1 release 2017-08-31 10:48:49 +03:00
dotneft
a206680ea3 Zabbix 3.4.0 release 2017-08-22 02:42:14 -07:00
Alexey Pustovalov
95b65f1aee Merge pull request #128 from zabbix/master
Zabbix 3.4 release
2017-08-22 12:25:50 +03:00
Alexey Pustovalov
09a338f782 Merge pull request #126 from zabbix/master
Zabbix 3.4 release
2017-08-22 12:24:51 +03:00
dotneft
6c7849cdd3 Zabbix 3.4 release 2017-08-22 02:23:19 -07:00
Alexey Pustovalov
f442acf4f3 Merge pull request #117 from zabbix/master
Master
2017-05-26 12:07:55 +03:00
Alexey Pustovalov
805863cb31 Merge pull request #115 from zabbix/master
Master
2017-05-26 12:06:26 +03:00
Alexey Pustovalov
be96e101dd TZ env variable renamed to PHP_TZ to avoid confusing with system-wide envs 2017-05-22 12:34:39 +03:00
Alexey Pustovalov
5e22f7959d Merge pull request #112 from zabbix/master
Fixed issue with ListenIP parameter
2017-05-12 16:53:59 +03:00
Alexey Pustovalov
7ea19c34fa Merge pull request #111 from zabbix/master
Fixed issue with ListenIP parameter
2017-05-12 16:53:42 +03:00