Commit Graph

4324 Commits

Author SHA1 Message Date
artica 61b35d4bf2 Auto-updated build strings. 2019-06-20 00:01:08 +02:00
fbsanchez 4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
artica a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +02:00
artica f293aa2dc0 Auto-updated build strings. 2019-06-18 00:01:08 +02:00
artica 38412f2c9a Auto-updated build strings. 2019-06-17 00:01:06 +02:00
artica ef280b1377 Auto-updated build strings. 2019-06-16 00:01:05 +02:00
artica 5b3e6143b3 Auto-updated build strings. 2019-06-15 00:01:07 +02:00
Daniel Rodriguez 975d48a653 Merge branch 'ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra' into 'develop'
Eventos en proceso no se validan ni por id_evento no por id_extra

See merge request artica/pandorafms!2481
2019-06-14 15:51:18 +02:00
Alejandro Fraguas b2dc732712 Merge branch '3702-bug-en-plugin-dns-servidor' into 'develop'
DNS plugin updated

See merge request artica/pandorafms!2261
2019-06-14 12:42:16 +02:00
artica 8f25aa09fc Auto-updated build strings. 2019-06-14 00:01:08 +02:00
artica 60ee0dd0fd Auto-updated build strings. 2019-06-13 00:01:07 +02:00
artica 51d5e1d951 Auto-updated build strings. 2019-06-12 00:01:07 +02:00
artica 4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
artica 7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica 0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
artica 2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
Luis Calvo e60433591e Added event in process status validation when same extra id 2019-06-06 14:56:28 +02:00
Luis Calvo ac679797a3 Merge remote-tracking branch 'origin/develop' into ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra 2019-06-06 14:53:14 +02:00
Luis Calvo 701c11a457 Added event in process status validation when same extra id 2019-06-06 14:52:39 +02:00
Daniel Rodriguez 75872850ce Merge branch 'ent-4153-threads-shared' into 'develop'
threads-shared returns

See merge request artica/pandorafms!2480
2019-06-06 13:31:12 +02:00
artica 034a910000 Auto-updated build strings. 2019-06-06 00:01:07 +02:00
artica 95574adf80 Auto-updated build strings. 2019-06-05 00:01:08 +02:00
fbsanchez b7c14d49fd threads-shared returns 2019-06-04 15:10:05 +02:00
artica c584367c14 Auto-updated build strings. 2019-06-04 00:01:06 +02:00
Alejandro Fraguas 45c58a7c72 Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
Variability event_storm_protection check is added with empty data

See merge request artica/pandorafms!2428
2019-06-03 11:58:52 +02:00
marcos.alconada 9b1e5a64b8 changes of core.pm reverted 2019-06-03 10:57:24 +02:00
marcos.alconada 2c0e8273a2 changes of core.pm reverted 2019-06-03 10:56:58 +02:00
marcos.alconada 87a9ce2d46 changes of core.pm reverted 2019-06-03 10:56:16 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +02:00
artica a11b674467 Auto-updated build strings. 2019-06-03 00:01:06 +02:00
artica cfc8d7d177 Auto-updated build strings. 2019-06-02 00:01:05 +02:00
artica f06d160141 Auto-updated build strings. 2019-06-01 00:01:06 +02:00
artica 2f734f2454 Auto-updated build strings. 2019-05-31 00:01:07 +02:00
artica bfef8e61ea Auto-updated build strings. 2019-05-30 00:01:06 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
#   pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
artica 8572a13319 Auto-updated build strings. 2019-05-29 00:01:07 +02:00
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
fbsanchez 83602e07b9 Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4 2019-05-27 11:06:29 +02:00
artica de3464bd02 Auto-updated build strings. 2019-05-27 00:01:05 +02:00
artica ba97da46c6 Auto-updated build strings. 2019-05-26 00:01:04 +02:00
artica a13701ed82 Auto-updated build strings. 2019-05-25 00:01:06 +02:00
fbsanchez c5bd3204ab Minor style, avoided duplicated iface names with spaces 2019-05-24 11:42:46 +02:00
artica cc09c257bc Auto-updated build strings. 2019-05-24 00:01:06 +02:00
Alejandro Fraguas 09020c3b9c Merge branch 'fix/pandora_ha_paths' into 'develop'
including several extra tokens in config

See merge request artica/pandorafms!2368
2019-05-23 11:58:15 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
artica 4c3dea3ba4 Auto-updated build strings. 2019-05-23 00:01:07 +02:00
fbsanchez 4fe7680694 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 15:33:13 +02:00