Commit Graph

187 Commits

Author SHA1 Message Date
Enrique Araque
b82b0efdd8 Bump revision for 4.12.0-rc1 and add a fogotten changelog entry 2025-04-30 11:24:31 +02:00
Gonzalo Acuña
c1fd8e2380 Merge branch '4.12.0' into merge-4.11.2-into-4.12.0 2025-04-01 11:38:17 -03:00
vcerenu
bd5e95a2b8 Bump 4.11.2 version 2025-03-17 13:12:33 -03:00
Carlos Anguita López
0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
Enrique Araque
79ead0cf55 Merge 4.10.1 into 4.11.0 2025-01-10 11:29:23 +01:00
vcerenu
23848dc8bf Add changelog 2024-12-23 08:44:15 -03:00
vcerenu
66a1533425 Bump 4.11.0 version 2024-12-20 10:40:22 -03:00
vcerenu
2c2388ce4a Bump 4.10.1 version 2024-12-20 10:14:29 -03:00
Enrique Araque
240f22b19c Merge 4.10.0 into 4.10.1 2024-12-13 13:19:45 +01:00
vcerenu
bfa6dfb3b3 Add Changelog 2024-11-13 08:11:40 -03:00
Enrique Araque
f6928b62e6 Bump revision to 41004 and update missing changelog entries 2024-11-08 12:34:30 +01:00
Gonzalo Acuña
5ef484647a Merge branch '4.10.1' into merge-4.10.0-into-4.10.1 2024-11-04 16:00:02 -03:00
Gonzalo Acuña
8bb96f3d69 Merge branch '4.10.0' into merge-4.9.2-into-4.10.0 2024-11-04 15:50:45 -03:00
Carlos Anguita López
8b18fb613c support new wazuh version 4.9.2 2024-10-25 12:09:57 +02:00
vcerenu
42977e3131 Resolve conflicts 2024-10-17 12:33:13 -03:00
vcerenu
691694a38d Resolve conflicts 2024-10-17 12:22:38 -03:00
JESUS D. GARCIA
dbb776690d Bump revision 2024-10-10 10:43:13 -05:00
vcerenu
f61af29c6b Add changelog 2024-10-10 12:07:39 -03:00
vcerenu
08ba82d16d Bump new Wazuh 4.10.1 version 2024-09-24 12:09:02 -03:00
JESUS D. GARCIA
471aedae5b Update changelog 2024-09-13 12:49:10 -05:00
David Correa Rodríguez
bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
David Correa Rodríguez
125053f6d5 Bump 4.9.1 version 2024-07-23 10:00:08 +02:00
vcerenu
8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
vcerenu
d59ee1bd35 merge 4.8.0 into 4.9.0 2024-05-31 11:00:50 -03:00
Gonzalo Acuña
042d0bf075 Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 14:58:27 -03:00
vcerenu
db89d2154f bump 4.7.5 version 2024-05-15 07:04:04 -03:00
vcerenu
390a71ebea resolving conflicts 2024-04-30 07:03:06 -03:00
vcerenu
4c74ebfc80 resolving conflicts 2024-04-30 05:39:50 -03:00
David Correa Rodríguez
d904595787 Bumped version to 4.7.4 2024-04-18 15:16:32 +02:00
Gonzalo Acuña
8f3478361d Merge pull request #1242 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-01 15:41:47 -03:00
Gonzalo Acuña
6a242a36ce Merge pull request #1240 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-01 14:43:38 -03:00
David Correa Rodríguez
63217770f7 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-01 12:32:27 +01:00
David Correa Rodríguez
f7e7a5a5fb Added 4.7.3 to CHANGELOG.md 2024-02-23 10:41:54 +01:00
vcerenu
5a5fbdd62c bump 4.7.3 version 2024-02-19 06:02:47 -03:00
Gonzalo Acuña
b6ebf179db Merge branch 'master' into merge-4.8.2-into-master 2024-01-04 15:03:16 -03:00
vcerenu
64ab19be1a bump 4.8.2 version 2024-01-04 10:01:05 -03:00
David Correa Rodríguez
5791218f83 Merge branch '4.8.1' into merge-4.8.1-into-master 2023-12-20 19:06:34 +01:00
David Correa Rodríguez
81b0172b37 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2023-12-20 18:48:06 +01:00
David Correa Rodríguez
eba8b9172f Merge branch '4.7.2' into merge-4.7.2-into-4.8.0 2023-12-20 18:23:15 +01:00
vcerenu
d44b87800a bump revision number 2023-11-30 06:11:07 -03:00
David Correa Rodríguez
0ef3428788 Merge branch '4.8.1' into merge-4.8.1-into-master 2023-11-27 18:18:42 +01:00
David Correa Rodríguez
8002f2d402 Bump version to 4.8.1 2023-11-22 11:18:14 +01:00
Victor Ereñú
103c7e66df Merge pull request #1069 from wazuh/merge-4.8.0-into-master
Merge 4.8.0 into master
2023-10-23 05:48:29 -03:00
vcerenu
274c0bc692 resolving conflicts 2023-10-23 05:39:31 -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
vcerenu
c46b1c0d82 resolving conflicts 2023-10-23 05:02:02 -03:00
vcerenu
5106715b0c bump 4.5.4 version 2023-10-17 05:55:15 -03:00
David Correa Rodríguez
0d66cfbd5a Bump version to 4.9.0 2023-10-13 13:29:18 +02:00
David Correa Rodríguez
d8f7fd6767 Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:47:11 +02:00