5224 Commits

Author	SHA1	Message	Date
fbsanchez	73e0a6d519	spec setup quiet	2020-01-08 13:19:51 +01:00
fbsanchez	be6e1e93f9	spec minor changes	2020-01-08 11:24:38 +01:00
fbsanchez	e26e12ea9d	spec changes reverted	2020-01-08 11:22:14 +01:00
fbsanchez	a9259d94f2	spec review	2020-01-08 10:45:16 +01:00
fbsanchez	c32e645e1b	Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms	2020-01-08 10:37:43 +01:00
artica	64e63dad63	Auto-updated build strings.	2020-01-08 00:01:15 +01:00
Daniel Rodriguez	4464bf71d8	Merge branch 'ent-4880-error-borrar-historico-datos-cli' into 'develop' ... Fixed CLI delete data See merge request artica/pandorafms!2857	2020-01-07 10:25:38 +01:00
artica	6e6e7ba249	Auto-updated build strings.	2020-01-07 00:01:09 +01:00
artica	ba9f6cd1a7	Auto-updated build strings.	2020-01-06 00:01:15 +01:00
artica	3f2884b282	Auto-updated build strings.	2020-01-05 00:01:08 +01:00
artica	9e5032e1e0	Auto-updated build strings.	2020-01-04 00:01:08 +01:00
fbsanchez	69be5aec24	Merge branch 'ent-5244-modulos-no-inicializan' into 'develop' ... Fix perl date issue See merge request artica/pandorafms!2997	2020-01-03 13:03:49 +01:00
artica	e66b8ca4e3	Auto-updated build strings.	2020-01-03 00:01:13 +01:00
fbsanchez	2e5a771663	timelocal to strftime	2020-01-02 16:00:01 +01:00
fbsanchez	14a2da39b1	minor fix	2020-01-02 15:49:32 +01:00
fbsanchez	dfca202dc4	Merge branch 'ent-5244-modulos-no-inicializan' of brutus.artica.es:artica/pandorafms into ent-5244-modulos-no-inicializan ... Conflicts: pandora_server/lib/PandoraFMS/Core.pm	2020-01-02 15:47:00 +01:00
fbsanchez	70d51413c9	timelocal to strftime	2020-01-02 15:46:27 +01:00
fbsanchez	fb3e395958	Fix perl date issue	2020-01-02 14:03:14 +01:00
fbsanchez	c1f026fea1	restored pandora_server.spec classic	2020-01-02 11:05:48 +01:00
fbsanchez	e48b41b7e7	Merge branch 'ent-5240-9303-bloqueos-discovery' of brutus.artica.es:artica/pandorafms into ent-5240-9303-bloqueos-discovery	2020-01-02 11:03:22 +01:00
fbsanchez	a3fdf4007d	Fixed method calls in Base.pm	2020-01-02 10:04:41 +01:00
fbsanchez	154b0c367f	Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms	2020-01-02 09:13:32 +01:00
artica	713737986b	Auto-updated build strings.	2020-01-02 00:01:10 +01:00
artica	d386d3c390	Auto-updated build strings.	2020-01-01 00:01:10 +01:00
artica	5b346c1ed9	Auto-updated build strings.	2019-12-31 00:01:11 +01:00
artica	287d377520	Auto-updated build strings.	2019-12-26 00:01:08 +01:00
artica	4294ec6d1b	Auto-updated build strings.	2019-12-25 00:01:11 +01:00
Enrique Martin	ea86205b36	Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan' ... Conflicts: pandora_server/conf/pandora_server.conf.new	2019-12-24 10:49:44 +01:00
Kike	79d3cd613f	Added rcmd_timeout_bin token in pandora_server.conf by default	2019-12-24 10:43:08 +01:00
Alejandro Fraguas	5c0636b074	Merge branch 'ent-5203-incluir-ssh_launcher-en-config-pm' into 'develop' ... Added ssh_launcher settings to pandora_Server See merge request artica/pandorafms!2979	2019-12-24 10:03:37 +01:00
artica	d653b4d685	Auto-updated build strings.	2019-12-24 00:01:22 +01:00
Kike	0f34528f6f	Set default rcmd_timeout=10 and new rcmd_timeout_bin token	2019-12-23 17:28:40 +01:00
fbsanchez	2a0187022b	Resolved deprecated options rpm spec	2019-12-23 13:28:38 +01:00
artica	cf8bf74cd4	Auto-updated build strings.	2019-12-23 00:01:17 +01:00
artica	59e91c0ed4	Auto-updated build strings.	2019-12-22 00:01:09 +01:00
artica	df704997e3	Auto-updated build strings.	2019-12-21 00:01:24 +01:00
artica	45a8904578	Auto-updated build strings.	2019-12-20 00:01:10 +01:00
fbsanchez	4197b7036b	Added ssh_launcher settings to pandora_Server	2019-12-19 11:48:20 +01:00
artica	f69d243330	Auto-updated build strings.	2019-12-19 00:01:09 +01:00
artica	dcd1bbd527	Auto-updated build strings.	2019-12-18 00:01:20 +01:00
artica	0b0c38f9c0	Auto-updated build strings.	2019-12-17 00:01:10 +01:00
artica	79cad3eaa9	Updated version and build strings.	2019-12-16 11:43:58 +01:00
artica	f7b0372e53	Auto-updated build strings.	2019-12-16 00:01:07 +01:00
artica	20f3583fc5	Auto-updated build strings.	2019-12-15 00:01:06 +01:00
artica	ebe0ba25c8	Auto-updated build strings.	2019-12-14 00:01:09 +01:00
artica	37c5acf4d1	Auto-updated build strings.	2019-12-13 00:01:12 +01:00
artica	dd49f0c91c	Auto-updated build strings.	2019-12-12 00:01:11 +01:00
artica	772b26ffcb	Auto-updated build strings.	2019-12-11 00:01:11 +01:00
Daniel Rodriguez	1350ef951b	Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop' ... Code reset and solved other issues with comments See merge request artica/pandorafms!2943	2019-12-10 17:21:48 +01:00
Jose Gonzalez	df79950a77	Solve issues with comments with quotes in CLI	2019-12-10 13:31:12 +01:00