 David Correa Rodríguez
|
1ee77e40ce
|
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0
|
2023-10-24 09:54:35 +02:00 |
|
|
David Correa Rodríguez
|
bfae09af52
|
Merge pull request #1081 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
|
2023-10-24 09:53:02 +02:00 |
|
|
David Correa Rodríguez
|
1c0b12deaa
|
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
|
2023-10-24 09:48:38 +02:00 |
|
|
David Correa Rodríguez
|
92b3395abc
|
Merge pull request #1080 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
|
2023-10-24 09:47:17 +02:00 |
|
|
David Correa Rodríguez
|
b1d10f879c
|
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0
|
2023-10-24 09:42:48 +02:00 |
|
|
David Correa Rodríguez
|
98e96a5260
|
Merge pull request #1077 from wazuh/merge-4.5.4-into-4.6.0
Merge 4.5.4 into 4.6.0
v4.6.0
|
2023-10-24 09:40:50 +02:00 |
|
|
David Correa Rodríguez
|
84e57b9c9a
|
Merge branch '4.5.4' into merge-4.5.4-into-4.6.0
|
2023-10-24 09:25:31 +02:00 |
|
|
Gonzalo Acuña
|
2cd1ca79e6
|
Merge pull request #1074 from wazuh/idr-394-defRoute
Dashboard default route update
|
2023-10-23 13:53:46 -03:00 |
|
|
Gonzalo Acuña
|
4c2582952f
|
Dashboard default route update
|
2023-10-23 13:28:22 -03:00 |
|
|
Victor Ereñú
|
e13cfcf454
|
Merge pull request #1073 from wazuh/bump-revision-4.6.0
Bump revision 40603
|
2023-10-23 12:33:32 -03:00 |
|
|
vcerenu
|
e48255641f
|
bump revision
|
2023-10-23 12:21:49 -03:00 |
|
|
Victor Ereñú
|
40618586a9
|
Merge pull request #1068 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
|
2023-10-23 05:43:06 -03:00 |
|
|
vcerenu
|
274c0bc692
|
resolving conflicts
|
2023-10-23 05:39:31 -03:00 |
|
|
Victor Ereñú
|
c4d6a254cc
|
Merge pull request #1067 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
|
2023-10-23 05:37:06 -03:00 |
|
|
vcerenu
|
d45e2d984e
|
resolving conflicts
|
2023-10-23 05:27:21 -03:00 |
|
|
vcerenu
|
781e6a4082
|
resolving conflicts
|
2023-10-23 05:25:42 -03:00 |
|
|
Victor Ereñú
|
0c7d298eea
|
Merge pull request #1066 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
|
2023-10-23 05:21:47 -03:00 |
|
|
Victor Ereñú
|
05ef9b899b
|
Merge pull request #1065 from wazuh/merge-4.5.4-into-4.6.0
Bump 4.5.4 version
|
2023-10-23 05:14:00 -03:00 |
|
|
vcerenu
|
c46b1c0d82
|
resolving conflicts
|
2023-10-23 05:02:02 -03:00 |
|
|
David Correa Rodríguez
|
3a3218f0d4
|
Merge pull request #1061 from wazuh/bump-revision-40510
Bump revision to 40510
v4.5.4
|
2023-10-19 12:00:04 +02:00 |
|
|
David Correa Rodríguez
|
dd86d1b707
|
Bump revision to 40510
|
2023-10-19 11:46:24 +02:00 |
|
|
Gonzalo Acuña
|
60563720f3
|
Merge pull request #1059 from wazuh/bug/1054-remove-filebeat-template-value
Removed value of Filebeat template variable
|
2023-10-17 11:05:17 -03:00 |
|
|
David Correa Rodríguez
|
0cd98767c8
|
Removed value of Filebeat template variable
|
2023-10-17 15:23:37 +02:00 |
|
|
Gonzalo Acuña
|
8aad8651d7
|
Merge pull request #1058 from wazuh/bump-version-4.5.4
Bump 4.5.4 version
|
2023-10-17 09:03:27 -03:00 |
|
|
vcerenu
|
3c073ab5ea
|
bump 4.5.4 version
|
2023-10-17 09:01:18 -03:00 |
|
|
Gonzalo Acuña
|
b8ff013b36
|
Merge pull request #1056 from wazuh/bug/1054-the-images-build-fails-due-to-filebeat-template-branch
Fixed Filebeat template bug in image generation
|
2023-10-17 08:33:09 -03:00 |
|
|
vcerenu
|
5106715b0c
|
bump 4.5.4 version
|
2023-10-17 05:55:15 -03:00 |
|
|
David Correa Rodríguez
|
523a28b20d
|
Fixed Filebeat template bug in image generation
|
2023-10-16 16:09:05 +02:00 |
|
|
David Correa Rodríguez
|
0f1cc4b955
|
Merge pull request #1053 from wazuh/bump-revision-40701
Bump revision to 40701
|
2023-10-13 11:42:21 +02:00 |
|
|
David Correa Rodríguez
|
aee83a1a2d
|
Bump revision to 40701
|
2023-10-13 10:25:38 +02:00 |
|
|
Victor Ereñú
|
7474e836b6
|
Merge pull request #1048 from wazuh/merge-4.7.1-into-master
Merge 4.7.1 into master
|
2023-10-11 06:00:37 -03:00 |
|
|
vcerenu
|
acb3688346
|
resolving conflicts
|
2023-10-11 05:47:56 -03:00 |
|
|
vcerenu
|
4d153f6705
|
bump new builder script
|
2023-10-11 05:44:48 -03:00 |
|
|
Victor Ereñú
|
85ba8cb9b0
|
Merge pull request #1036 from wazuh/merge-4.7.1-into-master
Merge 4.7.1 into master
|
2023-10-09 06:52:26 -03:00 |
|
|
vcerenu
|
5aaeb0d944
|
Updated version in new builder script
|
2023-10-09 11:45:24 +02:00 |
|
|
Victor Ereñú
|
aa88dad36a
|
Merge pull request #1038 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
|
2023-10-09 06:37:00 -03:00 |
|
|
vcerenu
|
a424c683ae
|
bump new builder script
|
2023-10-09 06:34:35 -03:00 |
|
|
Victor Ereñú
|
0555e4956b
|
Merge pull request #1037 from wazuh/bump-4.7.0
Bump new builder script
|
2023-10-09 06:31:28 -03:00 |
|
|
vcerenu
|
dee2c3c8dc
|
bump new builder script
|
2023-10-09 06:28:03 -03:00 |
|
|
David Correa Rodríguez
|
6b89644918
|
Merge branch '4.7.1' into merge-4.7.1-into-master
|
2023-10-09 11:07:47 +02:00 |
|
|
Victor Ereñú
|
1e29e8fcfc
|
Merge pull request #1035 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
|
2023-10-09 06:04:29 -03:00 |
|
|
David Correa Rodríguez
|
25be906860
|
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
|
2023-10-09 10:50:11 +02:00 |
|
|
Victor Ereñú
|
c18a1eca56
|
Merge pull request #1034 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
|
2023-10-09 05:33:57 -03:00 |
|
|
David Correa Rodríguez
|
14dcc8b6a6
|
Merge 4.6.0 into 4.7.0
|
2023-10-09 09:41:25 +02:00 |
|
|
Gonzalo Acuña
|
89e0fc9604
|
Merge pull request #1033 from wazuh/bump-revision-4.6.0
Bump revision to 40602
|
2023-10-06 09:15:14 -03:00 |
|
|
David Correa Rodríguez
|
64f083631d
|
Bump revision to 40602
|
2023-10-06 14:11:05 +02:00 |
|
|
David Correa Rodríguez
|
fa2f2b2a31
|
Merge pull request #1031 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
|
2023-10-06 10:48:10 +02:00 |
|
|
David Correa Rodríguez
|
8d1c239a3c
|
Merge branch '4.5.3' into merge-4.5.3-into-4.6.0
|
2023-10-06 10:23:04 +02:00 |
|
|
Gonzalo Acuña
|
ded91b2f0a
|
Merge pull request #1029 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
v4.5.3
|
2023-10-05 11:48:22 -03:00 |
|
|
Gonzalo Acuña
|
d7e051af19
|
Bump 4.5.3 revision
|
2023-10-05 11:44:40 -03:00 |
|