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
|
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 |
|
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 |
|
Gonzalo Acuña
|
d0327844bc
|
Bump to 4.3.7
|
2022-08-12 12:51:13 -03:00 |
|
Gonzalo Acuña
|
a1b7fa0562
|
Merge 4.3.6 into master (conflicts)
|
2022-07-22 12:32:37 -03:00 |
|
Gonzalo Acuña
|
dcdcb4d8b4
|
Bump to 4.3.6
|
2022-07-18 10:04:58 -03:00 |
|
Gonzalo Acuña
|
25e68f53d8
|
Bump to 4.3.5
|
2022-06-23 15:13:52 -03:00 |
|
Alberto R
|
e9e56ff248
|
Bumped version
|
2022-06-08 10:26:39 +02:00 |
|
Gonzalo Acuña
|
91e5449520
|
Conflicts resolution
|
2022-06-01 12:51:27 -03:00 |
|
Gonzalo Acuña
|
0b1114ef5e
|
Conflicts resolution
|
2022-06-01 12:39:24 -03:00 |
|
Gonzalo Acuña
|
76de7a5c14
|
Bump to 4.4.0
|
2022-06-01 12:25:12 -03:00 |
|
Gonzalo Acuña
|
c515b36cbc
|
Bump to 4.3.3
|
2022-05-31 09:35:10 -03:00 |
|
Gonzalo Acuña
|
94ee101dde
|
Bump 4.3 to 4.3.2
|
2022-05-30 10:34:06 -03:00 |
|
Gonzalo Acuña
|
2251a857e1
|
Bump master to 4.5
|
2022-05-20 15:03:16 -03:00 |
|
Gonzalo Acuña
|
7102ba7128
|
Conflicts resolution (4.3 to master)
|
2022-05-20 11:05:57 -03:00 |
|
José Fernández
|
3d762e34a6
|
Bumped 4.3 to 4.3.1 version
|
2022-05-16 10:35:09 +02:00 |
|
Alberto Rodríguez
|
bfd7e8bafc
|
Update CHANGELOG.md
Co-authored-by: José Fernández Aguilera <jose.fernandez@wazuh.com>
|
2022-03-28 16:59:51 +02:00 |
|
Gonzalo Acuña
|
97ea3f0078
|
Merge branch 'master' into 4.2-merge-master
|
2022-03-28 11:21:25 -03:00 |
|
c-bordon
|
3b8730d9b1
|
4.2.6 Bump
|
2022-03-25 10:23:05 -03:00 |
|
Alberto R
|
84291baa97
|
Bumped to 4.4.0
|
2021-11-24 17:10:24 +01:00 |
|
Nicolas Lastra
|
bb95ea167c
|
merge 4.2.5 in master
|
2021-11-16 11:35:56 -03:00 |
|