Commit Graph

191 Commits

Author SHA1 Message Date
Carlos Bordon
5720250826
Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 12:05:45 -03:00
Enrique Araque
e4c61578b3
Bump 4.7.5 version 2024-05-15 12:15:04 +02:00
Carlos Anguita López
96987e35b1
merge 4.7.4 into 4.8.0 2024-04-30 14:13:49 +02:00
c-bordon
f19f81fbb9
Bump branch 4.7.4 2024-04-18 10:36:19 -03:00
David Correa Rodríguez
7422e5790a
Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-02-23 10:55:37 +01:00
vcerenu
8660b5b1ca
bump 4.7.3 version 2024-02-19 05:34:37 -03:00
David Correa Rodríguez
5a25f1c625
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0 2023-12-20 18:21:30 +01:00
vcerenu
f591e37104
bump revision number 2023-11-30 05:58:24 -03:00
David Correa Rodríguez
fa5dffd9b0
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0 2023-10-23 10:30:43 +02:00
David Correa Rodríguez
77e44c105b
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-23 10:19:19 +02:00
David Correa Rodríguez
2fb6172cfa
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-10-23 10:10:59 +02:00
David Correa Rodríguez
9bffdbe93c
Added v4.5.4 to CHANGELOG.md 2023-10-23 09:52:38 +02:00
David Correa Rodríguez
237a5de1c8
Added empty line in CHANGELOG.md 2023-09-22 12:48:59 +02:00
David Correa Rodríguez
c1bcd06057
Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:39:45 +02:00
David Correa Rodríguez
035bf984c8
Bump version to 4.7.1 2023-09-20 11:08:28 +02:00
David Correa Rodríguez
2c128f9ab0
Merge branch '4.7.0' into merge-4.7.0-into-master 2023-09-07 16:21:42 +02:00
David Correa Rodríguez
aeff17a189
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-09-07 14:41:11 +02:00
Gonzalo Acuña
6bb6e713ee
Merge branch '4.6.0' into merge-4.5.3-into-4.6.0 2023-08-31 14:45:17 -03:00
David Correa Rodríguez
3bc97dfac7
Bumo to 4.5.3 2023-08-29 11:19:22 +02:00
Gonzalo Acuña
dbcb7d0fc3
Merge pull request #960 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
2023-07-21 09:25:00 -03:00
Gonzalo Acuña
ed826928f4
Merge pull request #959 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-07-21 08:50:16 -03:00
Gonzalo Acuña
50ef29b080
Merge branch '4.6.0' into merge-4.5.2-into-4.6.0 2023-07-21 08:06:26 -03:00
Gonzalo Acuña
3da2b23a5b
Bump to 4.5.2 2023-07-19 08:34:52 -03:00
vcerenu
5ef3d1cc3e
bump master to 4.8.0 2023-07-14 16:17:53 -03:00
c-bordon
0f923fea35
Merge 4.6.0 into master 2023-07-11 11:56:23 -03:00
c-bordon
a15655ae71
Merge 4.5.1 into 4.6.0 2023-07-11 11:25:27 -03:00
c-bordon
14cd098782
merge 4.5.0 with 4.5.1 2023-07-11 11:02:23 -03:00
c-bordon
6d10eeb9a3
Merge 4.4 into 4.5.0 2023-07-11 10:36:02 -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
c-bordon
247337badb
Bump 4.6.0 to 4.6.0 branch 2023-06-23 12:40:11 -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
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
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
7043b653d5
Bump to 4.4.3 2023-05-25 21:55:28 +02:00
Gonzalo Acuña
d34b9acaae
Conflicts resolution 2023-05-18 12:14:00 -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
vcerenu
e228ead890
resolving conflicts between branchs 2023-04-28 14:33:06 -03:00
vcerenu
a875ab96cd
bump 4.3.11 version 2023-04-19 16:59:19 -03:00
Gonzalo Acuña
0e15256486
Bumped to 4.4.1 2023-03-31 10:25:55 -03:00
Gonzalo Acuña
6952a17eca
Conflicts resolved 2023-02-01 10:47:03 -03:00
Gonzalo Acuña
49d1205e7f
Conflicts resolved 2023-02-01 09:08:19 -03:00
vcerenu
3fb1f933db
bump 4.3.10 version 2022-11-11 11:40:06 -03:00
Gonzalo Acuña
ea00a465b8
Merge 4.3 into 4.4 2022-10-21 08:45:01 -03:00
Gonzalo Acuña
6607cea7f4
Merge branch 'master' into merge-43-master 2022-10-12 09:22:38 -03:00
Gonzalo Acuña
034d502b46
Bump to 4.3.9 2022-09-27 14:52:05 -03:00
Gonzalo Acuña
1250f3a166
Merge branch '4.4' into merge-4.3-to-4.4 2022-09-15 14:47:48 -03:00
Gonzalo Acuña
e354d33ce9
Bump to 4.3.8 2022-09-12 09:43:58 -03:00