Commit Graph

2314 Commits

Author SHA1 Message Date
Carlos Anguita
0f15acb783 Merge pull request #1789 from wazuh/enhancement/1787-revert-image-tag-for-4.12.0-rc1 v4.12.0 2025-04-30 11:32:26 +02:00
Enrique Araque
118c7805e3 Revert docker image tag for 4.12.0-rc1 2025-04-30 11:30:05 +02:00
Carlos Anguita
7245dfb0ef Merge pull request #1788 from wazuh/enhancement/1787-bump-revision-for-4.12.0-rc1 2025-04-30 11:26:28 +02: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
Carlos Bordon
8e78fdfeec Merge pull request #1785 from wazuh/enhancement/revert-bump-4.12.0-beta1-image-tag
Revert bump image tag 4.12.0-beta1
2025-04-16 09:23:33 -03:00
Gonzalo Acuña
3fe18c0f53 Revert bump image tag 4.12.0-beta1 2025-04-16 09:20:02 -03:00
Carlos Bordon
34de7307f6 Merge pull request #1784 from wazuh/enhancement/bump-4.12.0-beta1-image-tag
Bump image tag 4.12.0-beta1
2025-04-16 09:16:19 -03:00
Gonzalo Acuña
cea3caee44 Bump image tag 4.12.0-beta1 2025-04-16 09:13:27 -03:00
Carlos Bordon
1e28240ceb Merge pull request #1783 from wazuh/enhancement/bump-4.12.0-beta1
Bump 4.12.0 to beta1
2025-04-16 09:11:06 -03:00
Gonzalo Acuña
c17b22c13b Bump 4.12.0 to beta1 2025-04-16 09:05:42 -03:00
Gonzalo Acuña
1da9ce981c Merge pull request #1772 from wazuh/enhancement/1770-revert-stage
Revert tags
2025-04-03 12:49:58 -03:00
Gonzalo Acuña
938a3df846 Revert tags 2025-04-03 12:48:17 -03:00
Gonzalo Acuña
3672c99a31 Merge pull request #1771 from wazuh/enhancement/1770-bump-stage
Bump stage and tags
2025-04-03 12:45:48 -03:00
Gonzalo Acuña
4a9f83ddee Bump stage and tags 2025-04-03 12:43:32 -03:00
Carlos Bordon
65b0d659d0 Merge pull request #1768 from wazuh/merge-4.11.2-into-4.12.0
Merge 4.11.2 into 4.12.0
2025-04-01 11:48:00 -03:00
Gonzalo Acuña
34b3c00596 Conflicts resolution 2025-04-01 11:46:57 -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
Gonzalo Acuña
d306f942f7 Merge pull request #1764 from wazuh/1762-revert-image-tag
Revert image tag
v4.11.2
2025-03-26 14:16:04 -03:00
Jesus Garcia
abde776e1b Revert image tag 2025-03-26 12:11:45 -05:00
Gonzalo Acuña
b6f628f3c1 Merge pull request #1763 from wazuh/bump-to-4.11.2-rc2-version
Update images to version 4.11.2-rc2 in multi-node and single-node
2025-03-26 13:57:56 -03:00
Jesus Garcia
06a5ba5297 Bump to 4.11.2-rc2 2025-03-26 10:59:51 -05:00
Carlos Anguita
85992aea95 Merge pull request #1760 from wazuh/enhancement/1758-revert-tag
Revert image tag
2025-03-20 09:28:02 +01:00
vcerenu
5057d0f083 Revert image tag 2025-03-20 05:24:28 -03:00
Carlos Anguita
562eb60e0f Merge pull request #1759 from wazuh/enhancement/1758-bump-revision
Bump revision
2025-03-20 09:12:55 +01:00
vcerenu
58d6ec2953 Change image tag 2025-03-20 05:10:18 -03:00
vcerenu
300c1bbcdd Bump revision 2025-03-20 05:05:02 -03:00
Gonzalo Acuña
1fe7647b47 Merge pull request #1756 from wazuh/enhancement/1755-bump-4.11.2-version
Bump 4.11.2 version
2025-03-17 13:51:59 -03:00
vcerenu
bd5e95a2b8 Bump 4.11.2 version 2025-03-17 13:12:33 -03:00
Gonzalo Acuña
f002f7e7b0 Merge pull request #1753 from wazuh/merge-4.11.1-into-4.12.0
Merge 4.11.1 into 4.12.0
2025-03-12 14:09:45 -03:00
vcerenu
72c0b196d0 Resolving merge conflicts 2025-03-12 14:04:58 -03:00
Carlos Anguita
ce53f0f05e Merge pull request #1747 from wazuh/enhancement/1745-revert-image-tag
Revert docker image for 4.11.1-rc2
v4.11.1
2025-03-10 10:27:01 +01:00
Enrique Araque
aa69278c44 Revert docker image for 4.11.1-rc2 2025-03-10 10:25:12 +01:00
Carlos Anguita
546f3cef9b Merge pull request #1746 from wazuh/enhancement/1745-bump-revision-and-change-docker-image-for-4.11.1-rc2
Bump revision and change docker image for 4.11.1-rc2
2025-03-10 10:22:23 +01:00
Enrique Araque
754c4b331e Bum revision and change docker image for 4.11.1-rc2 2025-03-10 10:16:10 +01:00
Carlos Anguita
4433476038 Merge pull request #1743 from wazuh/merge-4.11.1-into-4.12.0
Merge 4.11.1 into 4.12.0
2025-03-07 12:22:20 +01:00
Enrique Araque
e60c07a18f Merge 4.11.1 into 4.12.0 2025-03-07 12:18:07 +01:00
Carlos Bordon
fe0f76bd7b Merge pull request #1738 from wazuh/enhancement/1736-revert-bump-4.11.1-rc1
Revert image tag
2025-02-26 16:53:24 -03:00
Jesus Garcia
e4fec103ca Revert image tag 2025-02-26 14:50:55 -05:00
Carlos Bordon
28acd68e6e Merge pull request #1737 from wazuh/enhancement/1736-bump-4.11.1-rc1
Bump 4.11.1-rc1 revision
2025-02-26 16:43:40 -03:00
Jesus Garcia
fc8a8d6869 Bump 4.11.1-rc1 revision 2025-02-26 14:40:25 -05:00
Carlos Anguita
288630a722 Merge pull request #1734 from wazuh/enhancement/1731-merge-4.11.1-into-4.12.0 2025-02-21 12:37:51 +01:00
Enrique Araque
5c1d43c702 merge 4.11.1 into 4.12.0 2025-02-21 12:33:49 +01:00
Carlos Anguita
ff7c511f3b Merge pull request #1733 from wazuh/enhancement/1731-merge-4.11.0-into-4.11.1 2025-02-21 12:25:55 +01:00
Enrique Araque
5f689b8802 merge 4.11.0 into 4.11.1 2025-02-21 12:22:00 +01:00
Carlos Bordon
f73a819ee4 Merge pull request #1728 from wazuh/enhancement/1722-change-VERSION-file-format
Change VERSION file format
2025-02-17 14:55:45 -03:00
vcerenu
ebf8379373 Delete VERSION file reference 2025-02-17 14:44:43 -03:00
vcerenu
d024c37fc5 Change VERSION file format 2025-02-17 14:13:58 -03:00
vcerenu
87f3dccb0f Add newline 2025-02-17 13:36:46 -03:00
vcerenu
29e679363d Add changelog 2025-02-17 13:35:49 -03:00
vcerenu
6195484a82 Change VERSION file format 2025-02-17 13:23:35 -03:00