Daniel Rodriguez
|
11106f9b86
|
Merge branch 'ent-2835-revision-visor-de-logs' into 'develop'
Added models in tlog_graph_models
See merge request artica/pandorafms!2200
Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
|
2019-02-25 19:37:49 +01:00 |
Alejandro Campos
|
7f47a4504b
|
Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets'
# Conflicts:
# pandora_console/extras/mr/25.sql
Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
|
2019-02-25 18:47:28 +01:00 |
|
alejandro-campos
|
4bf7469565
|
change mr and migrate for table twidget
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
|
2019-02-25 18:42:52 +01:00 |
|
alejandro-campos
|
13cbc78fdd
|
change mr and migrate for table twidget
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
|
2019-02-25 18:41:24 +01:00 |
Daniel Maya
|
16f1474691
|
Added models in tlog_graph_models
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
|
2019-02-25 17:45:37 +01:00 |
fbsanchez
|
d8ee90c285
|
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
|
2019-02-25 14:42:48 +01:00 |
|
fbsanchez
|
e65d128b25
|
minor fix db schema
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
|
2019-02-22 12:40:02 +01:00 |
|
fbsanchez
|
42448cf0d8
|
Updated path for discovery plugins
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
|
2019-02-22 10:41:54 +01:00 |
|
fbsanchez
|
e856969a59
|
Minor fix changed vmware_plugin reference to vmware-plugin
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
|
2019-02-21 15:13:27 +01:00 |
|
fbsanchez
|
8fb84e910a
|
Minor SQL fixes discovery
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
|
2019-02-21 14:29:59 +01:00 |
|
fbsanchez
|
1167cfcafc
|
Minor SQL fixes discovery
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
|
2019-02-21 14:27:09 +01:00 |
|
fbsanchez
|
c12ba3b12e
|
Minor MR and sql updates - presets
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
|
2019-02-21 13:58:29 +01:00 |
|
fbsanchez
|
698451ee98
|
MR25 Discovery
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
|
2019-02-21 13:38:58 +01:00 |
|
alejandro-campos
|
acf3c94642
|
fix bad solved conflict and added changes in bd to migrate and mr
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
|
2019-02-21 13:16:32 +01:00 |