Commit Graph

2415 Commits

Author SHA1 Message Date
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
vcerenu
776d84a219
merge 4.4 to 4.5 2023-04-28 16:35:27 -03:00
vcerenu
441100d847
bump 4.4.2 version 2023-04-28 16:20:29 -03:00
Gonzalo Acuña
f4a4133f61
Merge pull request #911 from wazuh/merge-4-3-to-4-4
Merge `4.3` into `4.4`
2023-04-28 15:26:11 -03:00
vcerenu
6d1594e576
resolving conflicts 2023-04-28 14:57:08 -03:00
vcerenu
e228ead890
resolving conflicts between branchs 2023-04-28 14:33:06 -03:00
Gonzalo Acuña
663f1f27fd
Merge pull request #907 from wazuh/bump-4-3-11
Bump 4.3 to 4.3.11
2023-04-24 10:59:03 -03:00
vcerenu
fb76b8fe6a
update md5sum for Wazuh agent package 2023-04-24 10:27:59 -03:00
vcerenu
625b6a4ae4
change revision number 2023-04-24 09:25:04 -03:00
vcerenu
a875ab96cd
bump 4.3.11 version 2023-04-19 16:59:19 -03:00
Gonzalo Acuña
35e0e42e5c
Merge pull request #906 from wazuh/merge-4-4-into-master
Merge `v4.4.1` into `master`
2023-04-18 10:14:58 -03:00
vcerenu
f72ca43ce9
merge v4.4.1 into master 2023-04-17 13:43:41 -03:00
Gonzalo Acuña
d802d8820b
Merge pull request #903 from wazuh/4.4-bump-4.4.1
Bump `4.4` to `4.4.1`
2023-03-31 11:02:45 -03:00
Gonzalo Acuña
0e15256486
Bumped to 4.4.1 2023-03-31 10:25:55 -03:00
Gonzalo Acuña
fdf8286f47
Merge pull request #901 from wazuh/merge-4-4-to-4-5
Merge 4.4 into 4.5 branch
2023-03-31 06:29:09 -03:00
Gonzalo Acuña
3f5d43477f
Merge pull request #902 from wazuh/merge-4-4-to-master
Merge 4.4 into master branch
2023-03-31 06:27:38 -03:00
vcerenu
eadfa4a2db
resolving conflicts for merge 2023-03-30 16:45:04 -03:00
vcerenu
0a03928d8b
resolving conflicts for merge 2023-03-30 16:44:14 -03:00
Gonzalo Acuña
cd5772ca51
Merge pull request #898 from wazuh/4.4-revision
4.4 Revision and Windows Agent MD5 update
2023-03-28 10:03:14 -03:00
Gonzalo Acuña
5e467b103d
Win agent MD5 update 2023-03-28 09:32:02 -03:00
Gonzalo Acuña
e317b2a0fc
Revision update 2023-03-28 09:24:24 -03:00
Gonzalo Acuña
970263ae2e
Merge pull request #888 from wazuh/bump-master-46
Bump master to 4.6
2023-02-01 11:30:11 -03:00