Commit Graph

3385 Commits

Author SHA1 Message Date
daniel 137f4a1b69 resolve confict 2018-01-31 13:34:43 +01:00
artica 3235215547 Auto-updated build strings. 2018-01-31 00:01:14 +01:00
artica 2065207661 Auto-updated build strings. 2018-01-30 00:01:14 +01:00
vgilc 2af1b628a8 Merge branch '1730-missed-enterprise-plugins' into 'develop'
Fixed some default values in PluginTools

See merge request artica/pandorafms!1239
2018-01-29 13:37:11 +01:00
vgilc 2ef8a4905f Merge branch '1601-WUX_bloquea_el_inicio' into 'develop'
fixed error server WUX

See merge request artica/pandorafms!1146
2018-01-29 13:34:03 +01:00
vgilc 192fc99bf4 Merge branch '1620-Parametros_que_no_estan_o_sobran_en_el_pandora_server_conf' into 'develop'
fixed minor error pandora_server.conf

See merge request artica/pandorafms!1148
2018-01-29 13:32:45 +01:00
vgilc bc6b660592 Merge branch '1674-Sincronizacion-de-agentes-inmediata-con-metaconsola-en-operación-masiva' into 'develop'
Update metaconsole after agent bulk operations for update - #1674

See merge request artica/pandorafms!1174
2018-01-29 13:29:40 +01:00
artica 2b0688a76c Auto-updated build strings. 2018-01-29 00:01:11 +01:00
artica fd923a5adb Auto-updated build strings. 2018-01-28 00:01:11 +01:00
artica adb127c1c6 Auto-updated build strings. 2018-01-27 00:01:12 +01:00
fbsanchez 658f870265 Minor fixes PluginTools 2018-01-26 15:18:06 +01:00
fbsanchez 8473b589ec Removed invalid comment 2018-01-26 11:48:42 +01:00
fbsanchez e18abda8c0 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-26 11:44:07 +01:00
artica 3b88cc46a3 Auto-updated build strings. 2018-01-26 00:01:12 +01:00
fbsanchez 526b5aa29f Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-25 16:24:51 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
artica e6aa3de997 Auto-updated build strings. 2018-01-24 00:01:12 +01:00
artica f64498450a Auto-updated build strings. 2018-01-23 00:01:13 +01:00
fbsanchez d6feee7d67 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-22 15:51:19 +01:00
fbsanchez b1c70bb580 Modified snmp_remote.pl 2018-01-22 15:50:01 +01:00
artica dc9e33953e Auto-updated build strings. 2018-01-22 00:01:11 +01:00
artica 6541fe17e8 Auto-updated build strings. 2018-01-21 00:01:12 +01:00
artica d2c97be01c Auto-updated build strings. 2018-01-20 00:01:16 +01:00
fbsanchez b964758d53 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-19 16:26:40 +01:00
artica c0c251dd8e Auto-updated build strings. 2018-01-19 00:01:13 +01:00
fbsanchez 7d4e95f3cb Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-18 11:35:19 +01:00
artica c96b9aac0d Auto-updated build strings. 2018-01-18 00:01:12 +01:00
artica ff0132e8de Auto-updated build strings. 2018-01-17 00:01:12 +01:00
artica 9d01f98f21 Auto-updated build strings. 2018-01-16 00:01:12 +01:00
enriquecd a5a3d6ac64 Add _agentname_ and _agentalias_ macros to plugins - #1494 2018-01-15 11:51:33 +01:00
artica ae23342184 Auto-updated build strings. 2018-01-15 00:01:10 +01:00
artica 53cbb0f3e8 Auto-updated build strings. 2018-01-14 00:01:11 +01:00
artica d9668e97c9 Auto-updated build strings. 2018-01-13 00:01:16 +01:00
vgilc 8fcf3a7045 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-4' into 'develop'
Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 4

See merge request artica/pandorafms!1245
2018-01-12 08:49:22 +01:00
vgilc a79c1ae036 Merge branch 'feature/unknown-updates' into 'develop'
Add support for periodically updating the status of unknown modules.

See merge request artica/pandorafms!1248
2018-01-12 08:48:48 +01:00
artica 78e5f808ba Auto-updated build strings. 2018-01-12 00:01:16 +01:00
Ramon Novoa 934ab8ed91 Add support for periodically updating the status of unknown modules. 2018-01-11 16:00:22 +01:00
artica d9670999c0 Auto-updated build strings. 2018-01-11 00:01:16 +01:00
fermin831 13170e698e Fixed overflow problems in cron 2018-01-10 18:20:03 +01:00
fbsanchez b32e61cd3e Fixed some default values in PluginTools 2018-01-10 10:19:46 +01:00
artica b29271a3c0 Auto-updated build strings. 2018-01-10 00:01:15 +01:00
artica cca78fec2c Auto-updated build strings. 2018-01-09 00:01:15 +01:00
vgilc dca895c2a4 Merge branch '1733-filtro-de-traps-llena-el-log-de-error' into 'develop'
Replace a 'next' statement that exits a subroutine with a 'return'.

See merge request artica/pandorafms!1229
2018-01-08 12:33:32 +01:00
Ramon Novoa 600c43935d Replace a 'next' statement that exits a subroutine with a 'return'.
Ref pandora_enterprise#1733.
2018-01-08 10:49:57 +01:00
artica f51cb0249b Auto-updated build strings. 2018-01-08 00:01:12 +01:00
artica 459f752287 Auto-updated build strings. 2018-01-07 00:01:12 +01:00
artica 28c16bf17e Auto-updated build strings. 2018-01-06 00:01:12 +01:00
artica 5bf8262171 Auto-updated build strings. 2018-01-05 00:01:14 +01:00
artica 932f6ce0cf Auto-updated build strings. 2018-01-04 00:01:15 +01:00
artica 6c48e6544a Auto-updated build strings. 2018-01-03 00:01:16 +01:00