209 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexey Pustovalov	73c67df695	Merge pull request #274 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:10:14 +03:00
Alexey Pustovalov	c4937b52fd	Merge pull request #270 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:06:48 +03:00
root	849138440e	Fixed small issues. Preparation for Appliance	2018-03-30 06:19:06 -07:00
root	f4aa02c0b9	Fixed small issues. Preparation for Appliance	2018-03-30 06:15:14 -07:00
root	7bedb58dce	Fixed small issues. Preparation for Appliance	2018-03-30 05:37:54 -07:00
root	305b77fe7f	Fixed small issues. Preparation for Appliance	2018-03-30 05:36:16 -07:00
root	7c7635c388	Fixed small issues. Preparation for Appliance	2018-03-30 02:58:25 -07:00
root	2f8752ac1c	Fixed small issues. Preparation for Appliance	2018-03-30 01:36:04 -07:00
root	fb6866403c	Fixed small issues. Preparation for Appliance	2018-03-29 07:21:02 -07:00
Alexey Pustovalov	f6e90789a9	Merge pull request #260 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-29 16:54:52 +03:00
root	6e7a247564	Fixed small issues. Preparation for Appliance	2018-03-29 06:28:10 -07:00
root	26ba6ae137	Merge remote-tracking branch 'origin/master' into trunk	2018-02-23 13:49:47 -08:00
root	de98c6bbd8	Escpaing special characters	2018-02-23 13:43:00 -08:00
root	30ed00f5b0	Removed unused files	2018-02-23 01:46:37 -08:00
root	fc85c2c687	Merge remote-tracking branch 'origin/master' into trunk	2018-02-22 14:38:27 -08:00
root	6bde28aac3	Fix Apache on Ubuntu startup command	2018-02-22 14:37:03 -08:00
root	8603e1b2e5	Merge remote-tracking branch 'origin/master' into trunk	2018-02-22 13:31:28 -08:00
root	20271e6592	Fixed issue with supervisord daemon on Nginx Ubuntu images	2018-02-22 13:29:41 -08:00
root	637a44ebc1	Merge remote-tracking branch 'origin/master' into trunk	2018-02-22 12:55:42 -08:00
root	e274af43ee	Fixed issue with missing https in apt	2018-02-22 12:53:52 -08:00
root	ea3cbb7c8d	Merge remote-tracking branch 'origin/master' into trunk	2018-02-22 12:39:42 -08:00
root	2955fefc19	Fixed issue with missing iksemel package. It exists in EPEL only	2018-02-22 12:38:03 -08:00
root	2dbef36163	Removed supervisord from single application images	2018-02-22 12:31:38 -08:00
root	6a382c3f34	Removed supervisord from single application images	2018-02-22 12:07:15 -08:00
Alexey Pustovalov	d9ffdc0937	Merge pull request #237 from zabbix/master ... Fixed issue in ubuntu image	2018-02-22 13:04:06 +02:00
root	cfcad63159	Fixed issue in ubuntu image	2018-02-22 03:02:43 -08:00
Alexey Pustovalov	d6677fabf9	Merge pull request #232 from zabbix/master ... Fixed issue with config params undef	2018-02-21 03:02:52 +02:00
root	c79f2e0271	Fixed issue with config params undef	2018-02-20 08:23:18 -08:00
root	bef37e5715	Updated docker compose variables	2018-02-20 06:50:59 -08:00
root	8af278c2cc	Added v3 compose files	2018-02-20 06:44:19 -08:00
Alexey Pustovalov	cd441102d4	Merge pull request #228 from zabbix/master ... Added v3 compose files	2018-02-21 01:01:46 +02:00
root	67ed377c68	Added v3 compose files	2018-02-20 06:22:27 -08:00
root	08e0021858	New config parameters since Zabbix 3.4	2018-02-18 02:11:27 -08:00
root	4190605b57	Updated agent alpine	2018-02-17 23:32:01 -08:00
root	fbd7807667	Fixed issue with agent image	2018-02-17 18:03:28 -08:00
Alexey Pustovalov	d72c40b3d1	Merge pull request #224 from zabbix/master ... Fixed issue with web-nginx-mysql image	2018-02-19 13:07:27 +02:00
root	5ccac3cdf4	Fixed issue with web-nginx-mysql image	2018-02-17 17:10:43 -08:00
root	0b7127d2f3	Fixed issue with proxy-mysql image	2018-02-17 16:20:18 -08:00
Alexey Pustovalov	c8669d269b	Merge pull request #218 from zabbix/master ... Master	2018-02-19 12:13:47 +02:00
Alexey Pustovalov	53b81cb9a0	Merge pull request #211 from zabbix/revert-210-master ... Revert "Fixed issue with proxy-mysql image"	2018-02-19 11:28:44 +02:00
Alexey Pustovalov	793cb4ca26	Revert "Fixed issue with proxy-mysql image"	2018-02-19 11:28:32 +02:00
Alexey Pustovalov	6c59923fe8	Merge pull request #210 from zabbix/master ... Fixed issue with proxy-mysql image	2018-02-19 11:26:59 +02: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	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	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
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