 vcerenu
|
e4f782f55d
|
Resolving merge conflicts
|
2025-02-04 08:47:46 -03:00 |
|
|
Gonzalo Acuña
|
b29bd6b936
|
Merge pull request #1706 from wazuh/enhancement/1703-revert-tags
Revert image tags for alpha1
|
2025-01-24 09:41:01 -03:00 |
|
|
Gonzalo Acuña
|
2bed6e2d95
|
Revert image tags for alpha1
|
2025-01-24 09:38:55 -03:00 |
|
|
Gonzalo Acuña
|
73253898a2
|
Merge pull request #1705 from wazuh/enhancement/1703-image-tags
Image tags changed for alpha1
|
2025-01-24 09:26:54 -03:00 |
|
|
Gonzalo Acuña
|
2b30318a08
|
Image tags changed for alpha1
|
2025-01-24 09:25:01 -03:00 |
|
|
Gonzalo Acuña
|
49fb35633c
|
Merge pull request #1704 from wazuh/enhancement/1703-bump-revision
Revision bump
|
2025-01-24 09:23:05 -03:00 |
|
|
Gonzalo Acuña
|
052bce7ae1
|
Revision bump
|
2025-01-24 09:20:23 -03:00 |
|
|
Gonzalo Acuña
|
5fb9a0b6b1
|
Merge pull request #1698 from wazuh/enhancement/1697-bump-4.10.2-version
Bump 4.10.2 version
|
2025-01-17 15:40:32 -03:00 |
|
|
vcerenu
|
34d25df8ad
|
bump 4.10.2 version
|
2025-01-17 15:29:56 -03:00 |
|
|
Enrique Araque
|
c4bef8df3e
|
Merge pull request #1696 from wazuh/merge-4.11.0-into-4.12.0
|
2025-01-17 11:39:08 +01:00 |
|
|
Enrique Araque
|
31440d4a54
|
Merge branch '4.11.0' into merge-4.11.0-into-4.12.0
|
2025-01-17 11:35:45 +01:00 |
|
|
Enrique Araque
|
06e259714c
|
Merge pull request #1695 from wazuh/merge-4.10.2-into-4.11.0
|
2025-01-17 11:34:22 +01:00 |
|
|
Enrique Araque
|
d2bb16a493
|
Merge 4.10.2 into 4.11.0
|
2025-01-17 11:27:24 +01:00 |
|
|
Enrique Araque
|
a0c1fd8bf5
|
Merge pull request #1681 from wazuh/enhancement/1678-revert-docker-image
v4.10.1
|
2025-01-15 11:15:12 +01:00 |
|
|
Enrique Araque
|
c548f3e096
|
Revert docker image for 4.10.1-rc1
|
2025-01-15 11:11:51 +01:00 |
|
|
Carlos Anguita
|
69b4169fd5
|
Merge pull request #1680 from wazuh/enhancement/1678-change-docker-image
|
2025-01-15 11:08:32 +01:00 |
|
|
Enrique Araque
|
1ee604e4b1
|
Change docker image for 4.10.1-rc1
|
2025-01-15 11:05:59 +01:00 |
|
|
Carlos Anguita
|
5b3f46142e
|
Merge pull request #1679 from wazuh/enhancement/1678-bump-revision-to-41011
|
2025-01-15 11:01:47 +01:00 |
|
|
Enrique Araque
|
845f7e59ec
|
Bump revision for 4.10.1-rc1
|
2025-01-15 10:53:58 +01:00 |
|
|
Gonzalo Acuña
|
633c50bce6
|
Merge pull request #1674 from wazuh/bug/1673-add-permanent_data_excps
Add exceptions into PERMANENT_DATA script
|
2025-01-13 11:41:53 -03:00 |
|
|
vcerenu
|
347187c411
|
Add exceptions into PERMANENT_DATA script
|
2025-01-10 16:02:45 -03:00 |
|
|
Carlos Anguita
|
af11b8cbbb
|
Merge pull request #1672 from wazuh/merge-4.11.0-into-4.12.0
|
2025-01-10 11:56:57 +01:00 |
|
|
Enrique Araque
|
77ef56ada7
|
Update 4.11.0 version to 4.12.0
|
2025-01-10 11:53:10 +01:00 |
|
|
Enrique Araque
|
081436be42
|
Merge 4.11.0 into 4.12.0
|
2025-01-10 11:50:32 +01:00 |
|
|
Enrique Araque
|
a7cc8ef16e
|
Merge pull request #1671 from wazuh/merge-4.10.1-into-4.11.0
|
2025-01-10 11:37:46 +01:00 |
|
|
Enrique Araque
|
79ead0cf55
|
Merge 4.10.1 into 4.11.0
|
2025-01-10 11:29:23 +01:00 |
|
|
Carlos Anguita
|
7b415dc700
|
Merge pull request #1670 from wazuh/merge-4.10.0-into-4.10.1
|
2025-01-10 11:23:43 +01:00 |
|
|
Enrique Araque
|
f2a5901fd6
|
Merge 4.10.0 into 4.10.1
|
2025-01-10 11:18:47 +01:00 |
|
|
Carlos Anguita
|
2f3f00fc51
|
Merge pull request #1667 from wazuh/enhancement/1664-revert-docker-image
v4.10.0
|
2025-01-08 10:21:10 +01:00 |
|
|
Enrique Araque
|
98675f00fc
|
Change docker image for 4.10.0-rc3
|
2025-01-08 10:16:58 +01:00 |
|
|
Carlos Anguita
|
26e94102ce
|
Merge pull request #1666 from wazuh/enhancement/1664-change-docker-image
|
2025-01-08 10:13:02 +01:00 |
|
|
Enrique Araque
|
fc896872e2
|
Change docker image for 4.10.0-rc3
|
2025-01-08 10:10:42 +01:00 |
|
|
Carlos Anguita
|
e17302f280
|
Merge pull request #1665 from wazuh/enhancement/1664-bump-revision-41008
|
2025-01-08 10:07:45 +01:00 |
|
|
Enrique Araque
|
010642113b
|
Bump revision for 4.10.0-rc3
|
2025-01-08 10:04:52 +01:00 |
|
|
Gonzalo Acuña
|
90f1d446c1
|
Merge pull request #1663 from wazuh/bug/1642-free-disk-step
Change the cleaning disk step
|
2024-12-23 08:51:47 -03:00 |
|
|
vcerenu
|
23848dc8bf
|
Add changelog
|
2024-12-23 08:44:15 -03:00 |
|
|
vcerenu
|
9e6defa9d1
|
Change the cleaning disk step
|
2024-12-23 08:06:55 -03:00 |
|
|
Gonzalo Acuña
|
6a3b470f3c
|
Merge pull request #1662 from wazuh/change/1644-change-workflow-so-version
Change Ubuntu version used in workflows
|
2024-12-20 16:18:36 -03:00 |
|
|
vcerenu
|
91295a4b39
|
Change Ubuntu version used in workflows
|
2024-12-20 13:13:02 -03:00 |
|
|
Gonzalo Acuña
|
8885425b7f
|
Merge pull request #1661 from wazuh/enhancement/1657-bump-4.12.0-version
Bump 4.12.0 version
|
2024-12-20 10:50:02 -03:00 |
|
|
Gonzalo Acuña
|
2060e2103b
|
Merge pull request #1660 from wazuh/enhancement/1656-bump-4.11.0-version
Bump 4.11.0 version
|
2024-12-20 10:45:40 -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 |
|
|
Gonzalo Acuña
|
1f7eae1247
|
Merge pull request #1659 from wazuh/enhancement/1658-bump-4.10.1-version
Bump 4.10.1 version
|
2024-12-20 10:19:26 -03:00 |
|
|
vcerenu
|
2c2388ce4a
|
Bump 4.10.1 version
|
2024-12-20 10:14:29 -03:00 |
|
|
Gonzalo Acuña
|
be82d2c41d
|
Merge pull request #1651 from wazuh/enhancement/1650-bump-4.10.3-version
Bump 4.10.3 version
|
2024-12-18 14:46:53 -03:00 |
|
|
vcerenu
|
ff54368593
|
Bump new version
|
2024-12-18 13:58:58 -03:00 |
|
|
Carlos Anguita
|
7b03b99022
|
Merge pull request #1649 from wazuh/enhancement/1646-revert-docker-image
|
2024-12-18 10:52:16 +01:00 |
|
|
Enrique Araque
|
8a925f010f
|
Revert docker image for 4.10.0-rc2
|
2024-12-18 10:47:26 +01:00 |
|
|
Carlos Anguita
|
8468687b0c
|
Merge pull request #1648 from wazuh/enhancement/1646-change-docker-image
|
2024-12-18 10:45:58 +01:00 |
|