Commit Graph

3529 Commits

Author SHA1 Message Date
Daniel Rodriguez 8e6792596e Merge branch 'ent-5314-autodiscovery-2' into 'develop'
deleted binaries from repo

See merge request artica/pandorafms!3162
2020-04-14 18:30:04 +02:00
Daniel Rodriguez b841fec72e Revert "Merge branch 'revert-a73c9ecb' into 'develop'"
This reverts merge request !3157
2020-04-14 18:22:00 +02:00
Kevin 6dc1dc4934 deleted binaries from repo 2020-04-14 18:05:05 +02:00
Daniel Rodriguez 5965d2691d Revert "Merge branch 'ent-5314-autodiscovery' into 'develop'"
This reverts merge request !3144
2020-04-14 12:52:48 +02:00
artica 60ee065f8b Auto-updated build strings. 2020-04-14 01:00:15 +02:00
artica 8d27ff9350 Auto-updated build strings. 2020-04-13 01:00:08 +02:00
artica 8b609e2d26 Auto-updated build strings. 2020-04-11 01:00:15 +02:00
artica 017fdea2c7 Auto-updated build strings. 2020-04-10 01:00:14 +02:00
artica 6425d4d86d Auto-updated build strings. 2020-04-09 01:00:18 +02:00
artica 987d8f4c75 Auto-updated build strings. 2020-04-08 01:00:21 +02:00
Daniel Rodriguez a73c9ecb22 Merge branch 'ent-5314-autodiscovery' into 'develop'
Ent 5314 autodiscovery

See merge request artica/pandorafms!3144
2020-04-07 12:29:23 +02:00
artica 77b267c596 Auto-updated build strings. 2020-04-07 01:00:15 +02:00
artica a8043e98f9 Auto-updated build strings. 2020-04-06 01:00:14 +02:00
artica e013e26892 Auto-updated build strings. 2020-04-05 01:00:14 +02:00
artica d18dbc10e7 Auto-updated build strings. 2020-04-04 01:00:20 +02:00
Kevin d9d3f7b176 Latest changes 2020-04-03 14:51:24 +02:00
artica 297693a9d3 Auto-updated build strings. 2020-04-03 01:00:18 +02:00
Daniel Rodriguez 557864fdab Merge branch 'ent-5389-Errores-agente-debian' into 'develop'
copy plugins instead of moving

See merge request artica/pandorafms!3124
2020-04-02 14:32:23 +02:00
artica e30b9a32d8 Auto-updated build strings. 2020-04-02 01:00:16 +02:00
artica f68d84940c Auto-updated build strings. 2020-04-01 01:00:19 +02:00
alejandro-campos 5ba4b3e523 copy plugins instead of moving 2020-03-31 10:11:37 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
Kevin 90721eb858 included plugin in default .conf for windows and linux 2020-03-30 19:16:48 +02:00
artica 7991d6f215 Auto-updated build strings. 2020-03-30 01:00:14 +02:00
artica ea4b3bff04 Auto-updated build strings. 2020-03-29 01:00:15 +01:00
artica 9ca21e8768 Auto-updated build strings. 2020-03-28 01:00:19 +01:00
artica d2eac81d39 Auto-updated build strings. 2020-03-27 01:00:18 +01:00
artica 63fca15ead Auto-updated build strings. 2020-03-26 01:00:17 +01:00
artica 29cac0477e Auto-updated build strings. 2020-03-25 01:00:16 +01:00
Alejandro Fraguas 55c2d7d3e3 Merge branch 'ent-5003-8862-Error-plugin-route-parser-cuando-hay-bucles' into 'develop'
Avoid self parent

See merge request artica/pandorafms!3118
2020-03-24 14:11:16 +01:00
alejandro-campos 6d7715c67f Avoid self parent 2020-03-24 09:56:43 +01:00
artica ce2353d54d Auto-updated build strings. 2020-03-24 01:00:17 +01:00
artica d7b576d079 Auto-updated build strings. 2020-03-23 01:00:14 +01:00
artica d312c76fcf Auto-updated build strings. 2020-03-22 01:00:14 +01:00
artica 3f271ee9f7 Auto-updated build strings. 2020-03-21 01:00:16 +01:00
artica 958c17168a Auto-updated build strings. 2020-03-20 01:00:16 +01:00
artica 6cea6f62c2 Auto-updated build strings. 2020-03-19 01:00:16 +01:00
artica d7eaa4355b Auto-updated build strings. 2020-03-18 01:00:17 +01:00
artica b0e8a12df6 Auto-updated build strings. 2020-03-17 01:00:16 +01:00
artica b2de9eeef2 Auto-updated build strings. 2020-03-16 01:00:14 +01:00
artica 7cd987321e Auto-updated build strings. 2020-03-15 01:00:13 +01:00
artica a4c44bf68b Auto-updated build strings. 2020-03-14 01:00:15 +01:00
artica 3c4c659d95 Auto-updated build strings. 2020-03-13 01:00:16 +01:00
artica 48f014ee7d Auto-updated build strings. 2020-03-12 01:00:17 +01:00
artica c8ee27ed2b Auto-updated build strings. 2020-03-11 01:00:17 +01:00
artica 8b3dafc48f Auto-updated build strings. 2020-03-10 01:00:15 +01:00
Alejandro Fraguas 533ea33f5e Merge branch 'ent-4890-8989-pandora_df_used-filtro-por-regexp' into 'develop'
Added regexp

See merge request artica/pandorafms!2897
2020-03-09 11:27:08 +01:00
artica b7408b5e99 Auto-updated build strings. 2020-03-09 01:00:14 +01:00
artica 1ff7219e06 Auto-updated build strings. 2020-03-08 01:00:13 +01:00
artica d995210494 Auto-updated build strings. 2020-03-07 01:00:14 +01:00
artica bdd6cde6c2 Auto-updated build strings. 2020-03-06 01:00:16 +01:00
artica 4a5af5da40 Auto-updated build strings. 2020-03-05 01:00:08 +01:00
artica 9d3db50cf4 Auto-updated build strings. 2020-03-04 01:00:07 +01:00
artica 3e6cc7b2e7 Auto-updated build strings. 2020-03-03 01:00:09 +01:00
artica 015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
artica 97037d1266 Auto-updated build strings. 2020-03-02 01:00:08 +01:00
artica 501d76b975 Auto-updated build strings. 2020-03-01 01:00:08 +01:00
artica b106981613 Auto-updated build strings. 2020-02-29 01:00:10 +01:00
Daniel Rodriguez 4645ee6ea9 Merge branch 'ent-5350-Modulos-cron-de-agente-cambian-intervalo' into 'develop'
Changed logic of inverted interval management

See merge request artica/pandorafms!3074
2020-02-28 11:02:13 +01:00
artica 6e594f5503 Auto-updated build strings. 2020-02-28 01:00:10 +01:00
artica a9590892bf Auto-updated build strings. 2020-02-27 01:00:09 +01:00
artica 3b9e100f9f Auto-updated build strings. 2020-02-26 01:00:08 +01:00
Jose Gonzalez 816123f6ef Changed logic of inverted interval management 2020-02-25 17:45:07 +01:00
artica 400809ce61 Auto-updated build strings. 2020-02-25 01:00:10 +01:00
artica 03b97f4fdb Auto-updated build strings. 2020-02-24 01:00:07 +01:00
artica bfab0285e5 Auto-updated build strings. 2020-02-23 01:00:11 +01:00
artica 1667ed4f1c Auto-updated build strings. 2020-02-22 01:00:10 +01:00
artica 540fffc6ef Auto-updated build strings. 2020-02-21 00:01:14 +01:00
artica 70ee4f4e9b Auto-updated build strings. 2020-02-20 00:01:12 +01:00
artica a04b92a0bc Auto-updated build strings. 2020-02-19 09:12:12 +01:00
Daniel Rodriguez 46f282a5e1 Merge branch 'ent-5360-revisar-el-comportamiento-de-xml_buffer-y-secondary_mode' into 'develop'
Unify file transfer, secondary mode and XML buffer criteria.

See merge request artica/pandorafms!3034
2020-02-18 12:49:06 +01:00
Ramon Novoa 77cc2c6040 Fix a typo. 2020-02-18 12:03:34 +01:00
artica 92e1492f2b Auto-updated build strings. 2020-02-18 00:01:12 +01:00
artica bf0211c9b8 Auto-updated build strings. 2020-02-17 00:01:09 +01:00
artica 6a3d1b4992 Auto-updated build strings. 2020-02-16 00:01:08 +01:00
artica 19b59f2819 Auto-updated build strings. 2020-02-15 00:01:16 +01:00
artica e60ccb8a68 Auto-updated build strings. 2020-02-14 00:01:12 +01:00
artica d1663cd242 Auto-updated build strings. 2020-02-13 00:01:09 +01:00
artica 79fe01ee56 Auto-updated build strings. 2020-02-12 00:01:09 +01:00
artica 0db7abbe9e Auto-updated build strings. 2020-02-11 00:01:12 +01:00
artica 583c605b31 Auto-updated build strings. 2020-02-10 00:01:08 +01:00
artica 47b60c29d6 Auto-updated build strings. 2020-02-09 00:01:08 +01:00
artica 1be17441e7 Auto-updated build strings. 2020-02-08 00:01:08 +01:00
artica 0cb2f88540 Auto-updated build strings. 2020-02-07 00:01:25 +01:00
artica 36fdaf3ff7 Auto-updated build strings. 2020-02-06 00:01:11 +01:00
artica 70e5486ce6 Auto-updated build strings. 2020-02-05 00:01:11 +01:00
artica 3415838700 Auto-updated build strings. 2020-02-04 00:01:10 +01:00
artica af7d1ea5f9 Auto-updated build strings. 2020-02-03 00:01:08 +01:00
artica 690f6e715d Auto-updated build strings. 2020-02-02 00:01:08 +01:00
artica 3136563bba Auto-updated build strings. 2020-02-01 00:01:09 +01:00
artica 7aa9a630d0 Auto-updated build strings. 2020-01-31 00:01:10 +01:00
artica 1134c041f2 Auto-updated build strings. 2020-01-30 00:01:08 +01:00
Ramon Novoa dac5b6b6b3 Unify file transfer, secondary mode and XML buffer criteria.
Ref pandora_enterprise#5360
2020-01-29 13:08:00 +01:00
artica 2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +01:00
artica 395920f8eb Auto-updated build strings. 2020-01-29 00:01:09 +01:00
artica 71cc1f4951 Auto-updated build strings. 2020-01-28 00:01:07 +01:00
fbsanchez 50a2d74adb Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
Conflicts:
	pandora_server/pandora_server.spec
2020-01-27 12:38:19 +01:00
artica e35edd92b3 Auto-updated build strings. 2020-01-27 00:01:09 +01:00
artica 5dbb80287e Auto-updated build strings. 2020-01-26 00:01:10 +01:00
artica b4b1fbb3c1 Auto-updated build strings. 2020-01-25 00:01:10 +01:00