2879 Commits

Author	SHA1	Message	Date
fermin831	60f7a0ab79	Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios ... Conflicts: pandora_console/include/class/Tree.class.php	2018-04-10 09:29:14 +02:00
artica	e2b52a76f7	Auto-updated build strings.	2018-04-10 00:01:23 +02:00
artica	6bf0371a85	Auto-updated build strings.	2018-04-09 00:01:22 +02:00
artica	77f26cf08f	Auto-updated build strings.	2018-04-08 00:01:21 +02:00
artica	dcd57a421a	Auto-updated build strings.	2018-04-07 00:01:33 +02:00
artica	f517edca1c	Auto-updated build strings.	2018-04-06 00:01:25 +02:00
artica	4b36d86e48	Auto-updated build strings.	2018-04-05 00:01:24 +02:00
fermin831	d0c34e2ce7	[Secondary groups] Added secondary groups to linux agent and server	2018-04-04 16:05:18 +02:00
vgilc	c4aa6141e4	Merge branch '1801-migrado-cambios-jmx' into 'develop' ... 1801 migrado cambios jmx See merge request artica/pandorafms!1408	2018-04-04 15:22:58 +02:00
artica	f863184454	Auto-updated build strings.	2018-04-04 00:01:24 +02:00
fbsanchez	8a4ee8f28d	PluginTools pseudo control for as_agent/server_plugin	2018-04-03 18:22:38 +02:00
fbsanchez	7c202cbb81	PluginTools minor fix in log message	2018-04-03 17:14:11 +02:00
fbsanchez	63e644d88a	Minor fix	2018-04-03 17:12:31 +02:00
fermin831	e2d61d5794	[Secondary groups] Added update cache on server	2018-04-03 15:36:33 +02:00
fbsanchez	2380a18c6d	Minor changes in PluginTools for 1801	2018-04-03 09:46:44 +02:00
artica	337822a608	Auto-updated build strings.	2018-04-03 00:01:22 +02:00
artica	1ab18d6c2d	Auto-updated build strings.	2018-04-02 00:01:21 +02:00
artica	4e5d2477ac	Auto-updated build strings.	2018-04-01 00:01:22 +02:00
artica	727b69462a	Auto-updated build strings.	2018-03-31 00:01:21 +02:00
artica	7976e0461f	Auto-updated build strings.	2018-03-30 00:01:21 +02:00
artica	9ea7dc0dbb	Auto-updated build strings.	2018-03-29 00:01:22 +02:00
artica	94936a46e9	Auto-updated build strings.	2018-03-28 00:01:22 +02:00
artica	ac2638ceea	Auto-updated build strings.	2018-03-27 00:01:22 +02:00
artica	999edad737	Auto-updated build strings.	2018-03-26 00:01:20 +02:00
artica	b2ed2fbe45	Auto-updated build strings.	2018-03-25 00:01:20 +01:00
artica	c91e71569c	Auto-updated build strings.	2018-03-24 00:01:24 +01:00
artica	dd59704729	Auto-updated build strings.	2018-03-23 00:01:21 +01:00
artica	243e24e56e	Auto-updated build strings.	2018-03-22 00:01:23 +01:00
artica	199b81a79c	Auto-updated build strings.	2018-03-21 00:01:22 +01:00
artica	972e394a8e	Auto-updated build strings.	2018-03-20 00:01:22 +01:00
artica	25efa085ce	Auto-updated build strings.	2018-03-19 00:01:29 +01:00
artica	c4ddcc9332	Auto-updated build strings.	2018-03-18 00:01:21 +01:00
artica	ea5ef0bc42	Auto-updated build strings.	2018-03-17 00:01:23 +01:00
artica	a17c7c3e34	Auto-updated build strings.	2018-03-16 00:01:21 +01:00
vgilc	c0cc6bbb5e	Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' ... Added missing constants for two servers. See merge request artica/pandorafms!1373	2018-03-15 12:50:11 +01:00
Ramon Novoa	9bdc23077c	Added missing constants for two servers.	2018-03-15 12:41:30 +01:00
artica	270a43fbeb	Auto-updated build strings.	2018-03-15 00:01:23 +01:00
vgilc	387280e97f	Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' ... 1873 autoprovisionamiento de agentes See merge request artica/pandorafms!1342	2018-03-14 09:12:07 +01:00
artica	fb56ebfbff	Auto-updated build strings.	2018-03-14 00:01:25 +01:00
Ramon Novoa	42107017bf	Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes	2018-03-13 18:40:51 +01:00
Ramon Novoa	21f8194f0d	Add a new agent provisioning server (enterprise).	2018-03-13 17:52:34 +01:00
Ramon Novoa	b63a1c4ce8	Remove debugging messages.	2018-03-13 17:52:34 +01:00
vgilc	8af4272152	Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop' ... 1923 migrar agentes desde metaconsola See merge request artica/pandorafms!1364	2018-03-13 17:47:52 +01:00
fbsanchez	ed282c6a9b	1923 Added required methods for migrationserver	2018-03-13 16:35:13 +01:00
daniel	a3dceac0a0	Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola	2018-03-13 16:00:44 +01:00
fermin831	e03ad1a1bf	[Server] Fixed undefined module_interval	2018-03-13 13:03:44 +01:00
artica	af5d70bd7d	Updated version and build strings.	2018-03-13 11:06:33 +01:00
artica	24ff4014ff	Auto-updated build strings.	2018-03-13 00:01:27 +01:00
fbsanchez	7d58734ef2	MigrationServer aux util	2018-03-12 19:39:28 +01:00
fbsanchez	4566aee4e1	Fixed duplicate definition $rs	2018-03-12 13:47:57 +01:00