Commit Graph

210 Commits

Author SHA1 Message Date
Enrique Araque
c6284f5b2d Merge branch '4.12.2' into merge-4.12.2-into-4.13.0 2025-05-08 10:19:01 +02:00
Enrique Araque
f0c945b3bd Merge branch '4.12.1' into merge-4.12.1-into-4.12.2 2025-05-08 10:12:01 +02:00
Enrique Araque
4eea59da8b Merge branch '4.12.0' into merge-4.12.0-into-4.12.1 2025-05-08 10:04:07 +02:00
vcerenu
81a41f93ed Bump 4.12.2 version 2025-05-06 13:56:32 -03:00
Enrique Araque
b82b0efdd8 Bump revision for 4.12.0-rc1 and add a fogotten changelog entry 2025-04-30 11:24:31 +02:00
c-bordon
e161490f4d Updated changelog 2025-04-15 14:37:50 -03:00
Enrique Araque
49b45fb342 Merge branch '4.10.2' into merge-4.10.2-into-4.11.0 2025-04-11 13:42:03 +02:00
Jesus Garcia
a371c28a05 Bump to 4.12.1 2025-04-09 10:24:24 -05:00
Carlos Bordon
dfb3289bd8 Merge pull request #1769 from wazuh/merge-4.12.0-into-4.13.0
Merge 4.12.0 into 4.13.0
2025-04-01 11:55:36 -03: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
Jesus Garcia
51d3d7a946 Remove default docker reference version from workflow 2025-03-25 16:21:59 -05:00
Jesus Garcia
c1565a5553 Remove 'stable' branch ocurrencies 2025-03-18 11:16:52 -05:00
vcerenu
bd5e95a2b8 Bump 4.11.2 version 2025-03-17 13:12:33 -03:00
vcerenu
87a3ccd3ee Add changelog 2025-03-11 15:08:41 -03:00
vcerenu
b2de3600ce Bump 4.13.0 version 2025-03-10 13:44:19 -03:00
Enrique Araque
5c1d43c702 merge 4.11.1 into 4.12.0 2025-02-21 12:33:49 +01:00
vcerenu
29e679363d Add changelog 2025-02-17 13:35:49 -03:00
Carlos Anguita López
0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
Enrique Araque
081436be42 Merge 4.11.0 into 4.12.0 2025-01-10 11:50:32 +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
39768a397a Bump 4.12.0 version 2024-12-20 10:45:08 -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
vcerenu
ff54368593 Bump new version 2024-12-18 13:58:58 -03:00
Enrique Araque
0980cf0257 Merge branch '4.10.1' into merge-4.10.1-into-4.10.2 2024-12-13 13:31:28 +01: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
a13406a029 Merge pull request #1603 from wazuh/bug/1601-permanent_data
Fix permanent data scripts
2024-11-05 14:20:28 -03:00
Carlos Bordon
b9a52df0ff Merge pull request #1609 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-11-04 16:03:32 -03: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
vcerenu
22f34ccb40 Add changelog 2024-11-01 11:55:54 -03:00
Carlos Anguita López
8b18fb613c support new wazuh version 4.9.2 2024-10-25 12:09:57 +02:00
vcerenu
a5c313843e Resolve conflicts 2024-10-17 12:49:32 -03: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
c-bordon
e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -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