Commit Graph

52 Commits

Author SHA1 Message Date
root
37df41f2f0 Fixed small issues. Preparation for Appliance 2018-03-30 02:04:04 -07:00
root
8f487259bb Merge remote-tracking branch 'origin/master' into 3.2 2018-02-22 12:54:36 -08:00
root
e274af43ee Fixed issue with missing https in apt 2018-02-22 12:53:52 -08:00
Alexey Pustovalov
a2879cb448
Merge pull request #239 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:10:58 +02:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -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
Alexey Pustovalov
acfe3e7a2d
Merge pull request #199 from zabbix/master
Master
2018-02-18 23:13:22 +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
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
796e0e8fbe Zabbix 3.2.10 release 2017-11-09 15:42:30 +02:00
root
b011c4d16d Fixed MySQL user creation 2017-10-27 19:05:18 +03:00
root
3b989be95f Zabbix 3.4.3 release 2017-10-21 17:34:03 +03:00
root
d643c8057a Zabbix 3.2.9 release 2017-10-21 17:32:57 +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
f5fa79a8d9 Zabbix v3.2.6 2017-05-12 16:35:12 +03:00
Alexey Pustovalov
780944d92c Merge pull request #102 from zabbix/master
Master
2017-05-01 16:55:05 +03:00
Alexey Pustovalov
c6255f4fd9 Merge pull request #100 from zabbix/master
Master
2017-05-01 16:53:46 +03:00
Alexey Pustovalov
31d4d911a7 Merge pull request #99 from zabbix/master
Master
2017-04-28 16:28:33 +03:00
Alexey Pustovalov
c42c504880 Merge pull request #98 from zabbix/master
Master
2017-04-28 16:28:13 +03:00
dotneft
fb7c65078b Fixed Nginx temporary data folder permissions 2017-04-27 15:11:48 -07:00
dotneft
fa1542a14e Changed maintainer to new format 2017-04-27 09:32:34 -07:00
dotneft
bacd6da712 3.2.5 release 2017-04-27 05:12:16 -07:00
dotneft
3b514b2c64 3.2.4 release 2017-03-11 13:27:55 -08:00
dotneft
fe990ffa80 3.2.3 release 2016-12-23 01:26:04 -08:00
dotneft
1ced9ed6d9 Zabbix 3.2.2 release 2016-12-01 04:54:30 -08:00
dotneft
d36f651731 Trunk update 2016-10-28 07:10:53 -07:00
dotneft
ec613786c9 Trunk update 2016-10-28 07:09:29 -07:00
Alexey Pustovalov
e411bc3dde Merge pull request #49 from zabbix/master
Fixed chown argument
2016-10-24 21:41:52 +03:00
dotneft
4b6323212d Fixed chown argument 2016-10-24 11:41:18 -07:00
Alexey Pustovalov
4a2ebd1bcc Merge pull request #46 from zabbix/master
Accumulated merge
2016-10-24 21:13:59 +03:00
dotneft
443d43f502 Fix for session path on Nginx + Ubuntu 2016-10-24 09:07:07 -07:00
dotneft
a97615b19c 3.2.1 2016-09-23 01:28:17 -07:00
dotneft
4f902132b9 3.2.0 release 2016-09-13 01:27:16 -07:00
dotneft
d650b9f52e v3.2.0rc1 2016-09-10 07:32:03 -07:00
dotneft
5aff895c42 3.2.0beta2 2016-08-31 08:42:24 -07:00
dotneft
c582276b5a 3.2.0beta1 2016-08-23 12:51:31 -07:00
dotneft
c68ec611bf 3.2.0alpha2 2016-08-22 04:11:28 -07:00
dotneft
1be979ef82 Prepare 3.2 branch 2016-08-05 14:10:16 -07:00
dotneft
ab60301da6 Added README.md files 2016-08-03 22:09:11 -07:00
dotneft
6526e27d1e Fixed master revision 2016-08-03 05:36:06 -07:00
dotneft
dcd7f63aa9 Moved snmptraps to different image 2016-08-03 05:23:39 -07:00