c-bordon
|
0f923fea35
|
Merge 4.6.0 into master
|
2023-07-11 11:56:23 -03:00 |
|
Victor Ereñú
|
3f9fb6e4f9
|
Merge pull request #950 from wazuh/merge-4.5.1-into-4.6.0
Merge 4.5.1 into 4.6.0
|
2023-07-11 11:35:46 -03:00 |
|
c-bordon
|
a3190269a8
|
Fixed branch error
|
2023-07-11 11:31:39 -03:00 |
|
c-bordon
|
a15655ae71
|
Merge 4.5.1 into 4.6.0
|
2023-07-11 11:25:27 -03:00 |
|
Victor Ereñú
|
3d325ed525
|
Merge pull request #949 from wazuh/merge-4.5.0-into-4.5.1
Merge 4.5.0 into 4.5.1
|
2023-07-11 11:12:28 -03:00 |
|
c-bordon
|
14cd098782
|
merge 4.5.0 with 4.5.1
|
2023-07-11 11:02:23 -03:00 |
|
Carlos Bordon
|
b1e3ef783b
|
Merge pull request #948 from wazuh/merge-4.4-to-4.5.0
Merge 4.4 into 4.5.0
|
2023-07-11 10:43:15 -03:00 |
|
c-bordon
|
6d10eeb9a3
|
Merge 4.4 into 4.5.0
|
2023-07-11 10:36:02 -03:00 |
|
Victor Ereñú
|
3d4c60344b
|
Merge pull request #942 from wazuh/bump-4-5-1
Bump version 4.5.1
|
2023-06-26 14:08:09 -03:00 |
|
vcerenu
|
97517742a0
|
bump version 4.5.1
|
2023-06-26 13:26:37 -03:00 |
|
vcerenu
|
6192220d14
|
bump version 4.5.0
|
2023-06-26 09:48:45 -03:00 |
|
Victor Ereñú
|
78ea537f6e
|
Merge pull request #940 from wazuh/Bump-4.6.0-to4.6.0
Bump 4.6.0 to 4.6.0 branch
|
2023-06-23 12:46:46 -03:00 |
|
c-bordon
|
247337badb
|
Bump 4.6.0 to 4.6.0 branch
|
2023-06-23 12:40:11 -03:00 |
|
David Jose Iglesias Lopez
|
0c72f4d76c
|
Merge pull request #939 from wazuh/Bump-4.7-tomaster
Bump master to 4.7.0
|
2023-06-23 15:40:12 +02:00 |
|
c-bordon
|
2e8791f8ea
|
Bump master to 4.7.0
|
2023-06-23 09:04:23 -03:00 |
|
Gonzalo Acuña
|
0669c216ed
|
Merge pull request #938 from wazuh/merge-4.5-into-master
Merge `4.5` into `master`
|
2023-06-14 16:36:36 -03:00 |
|
Gonzalo Acuña
|
bf11ea19f8
|
Merge pull request #937 from wazuh/merge-4.4.5-into-4.5
Merge `4.4.5` into `4.5`
|
2023-06-14 15:48:38 -03:00 |
|
Gonzalo Acuña
|
e8a11e98f8
|
Merge branch '4.5' into merge-4.4.5-into-4.5
|
2023-06-14 15:13:59 -03:00 |
|
Gonzalo Acuña
|
9a58bd6ef6
|
Merge pull request #936 from wazuh/merge-4.4-into-4.4.5
Merge `4.4` into `4.4.5`
|
2023-06-14 14:50:52 -03:00 |
|
Gonzalo Acuña
|
338ea102a5
|
Merge branch '4.4.5' into merge-4.4-into-4.4.5
|
2023-06-14 14:04:32 -03:00 |
|
Gonzalo Acuña
|
707cd69523
|
Merge pull request #932 from wazuh/merge-444-into-44
Bump `4.4` to `4.4.4`
|
2023-06-13 16:18:16 -03:00 |
|
Gonzalo Acuña
|
dd9c62c44f
|
Merge branch '4.4' into merge-444-into-44
|
2023-06-13 13:44:44 -03:00 |
|
Gonzalo Acuña
|
6d5c7efede
|
Windows agent MD5 update
|
2023-06-13 13:29:52 -03:00 |
|
Gonzalo Acuña
|
fe97d1e614
|
Revision bump
|
2023-06-13 13:29:36 -03:00 |
|
Gonzalo Acuña
|
b69545e28f
|
Windows agent MD5 update
|
2023-06-13 13:16:19 -03:00 |
|
Gonzalo Acuña
|
7b5a999784
|
Revision bump
|
2023-06-12 09:42:38 -03:00 |
|
Gonzalo Acuña
|
059b44c7f5
|
Merge pull request #933 from wazuh/win-md5-fix-443
Windows MD5 fix in 4.4.3
|
2023-06-09 13:50:12 -03:00 |
|
Gonzalo Acuña
|
f42dbc2e39
|
MD5 fix for 4.4.3
|
2023-06-09 12:30:05 -03:00 |
|
Gonzalo Acuña
|
699d27ac1b
|
Windows MD5 updated for 4.4.4
|
2023-06-06 11:48:58 -03:00 |
|
c-bordon
|
8181ee8b91
|
Partial bump to 4.4.5, update of md5 Windows is needed
|
2023-06-06 09:14:46 -03:00 |
|
c-bordon
|
1456e51500
|
Partial bump to 4.4.4, update of md5 Windows is needed
|
2023-06-06 09:11:41 -03:00 |
|
Raul Del Pozo Moreno
|
173e8bead7
|
Merge pull request #927 from wazuh/master-merge-4.5
Merge `4.5` into `master`
|
2023-05-29 19:37:06 +02:00 |
|
Raul Del Pozo Moreno
|
6be1338e50
|
Merge remote-tracking branch 'origin/4.5' into master-merge-4.5
|
2023-05-29 19:15:17 +02:00 |
|
Raul Del Pozo Moreno
|
8e29408d95
|
Merge pull request #926 from wazuh/4.5-merge-4.4
Merge `4.4` into `4.5`
|
2023-05-29 19:14:44 +02:00 |
|
Raul Del Pozo Moreno
|
fddd0260b9
|
Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4
|
2023-05-29 19:02:52 +02:00 |
|
Raul Del Pozo Moreno
|
d5e929103b
|
Merge pull request #925 from wazuh/894-remove-roles-4.4
Remove deprecated roles
|
2023-05-29 18:59:23 +02:00 |
|
Raul Del Pozo Moreno
|
7c55c46662
|
Removed deprecated roles
|
2023-05-29 18:45:28 +02:00 |
|
Raul Del Pozo Moreno
|
2711be734c
|
Removed deprecated roles
|
2023-05-29 18:04:19 +02:00 |
|
Raul Del Pozo Moreno
|
6c2edd6c6e
|
Merge pull request #923 from wazuh/bump-4.4.3
Bump `4.4` to `4.4.3`
|
2023-05-26 18:56:44 +02:00 |
|
Raul Del Pozo Moreno
|
7043b653d5
|
Bump to 4.4.3
|
2023-05-25 21:55:28 +02:00 |
|
Gonzalo Acuña
|
ecb75efa95
|
Merge pull request #920 from wazuh/merge-44-into-45
Merge `4.4` into `4.5`
|
2023-05-18 14:49:23 -03:00 |
|
Gonzalo Acuña
|
3e8a69bb37
|
Conflicts resolution
|
2023-05-18 12:18:53 -03:00 |
|
Gonzalo Acuña
|
08e8412a75
|
Deprecated files deleted
|
2023-05-18 12:16:35 -03:00 |
|
Gonzalo Acuña
|
d34b9acaae
|
Conflicts resolution
|
2023-05-18 12:14:00 -03:00 |
|
Gonzalo Acuña
|
09d9ccee87
|
Merge pull request #917 from wazuh/bump-4-4-2
Bump `4.4` to `4.4.2`
|
2023-05-18 07:32:46 -03:00 |
|
Gonzalo Acuña
|
c5b723de34
|
Version and Windows MD5 update
|
2023-05-17 14:29:20 -03:00 |
|
Gonzalo Acuña
|
6fe1b8cdbc
|
Merge pull request #916 from wazuh/merge-45-into-master
Merge `4.5` into `master`
|
2023-05-17 09:59:38 -03:00 |
|
Gonzalo Acuña
|
f9a1e01f82
|
Merge branch 'master' into merge-45-into-master
|
2023-05-17 09:47:01 -03:00 |
|
Gonzalo Acuña
|
4def97df61
|
Merge pull request #914 from wazuh/merge-4-4-to-4-5
Merge `4.4` into `4.5`
|
2023-05-16 13:11:57 -03:00 |
|
Gonzalo Acuña
|
09fa42b80a
|
Deprecated files deleted
|
2023-05-16 09:47:43 -03:00 |
|