Commit Graph
2280 Commits
Author SHA1 Message Date
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
Carlos Bordon 3d9981d9fa Merge pull request #1725 from wazuh/enhancement/1723-revert-image-tag
Revert docker image for 4.11.0-rc1
v4.11.0
2025-02-14 08:51:25 -03:00
Enrique Araque 06821f172f Revert docker image for 4.11.0-rc1 2025-02-14 12:48:50 +01:00
Carlos Bordon 660e472b7c Merge pull request #1724 from wazuh/enhancement/1723-bump-revision-to-41103
Bump revision and change image tag
2025-02-14 08:44:46 -03:00
Enrique Araque af33c2dd7c Fix revision 2025-02-14 12:40:55 +01:00
Enrique Araque 331fb1969e Bump revision and change image tag 2025-02-14 12:39:18 +01:00
Carlos Bordon b88d852b9f Merge pull request #1718 from wazuh/enhancement/1716-revert-tags
Revert image tags for beta1
2025-02-06 13:55:19 -03:00
fcaffieri 281cde7292 Revert image tags for beta1 2025-02-06 13:53:46 -03:00
Carlos Bordon c9bbf912b0 Merge pull request #1717 from wazuh/enhancement/1716-bump-revision
Revision bump
2025-02-06 13:47:06 -03:00
fcaffieri 7a189605eb Image tags changed for beta1 2025-02-06 13:36:38 -03:00
fcaffieri ae32e0111d Revision bump 2025-02-06 13:29:27 -03:00
fcaffieri e29dd1195b Revision bump 2025-02-06 13:27:42 -03:00
Carlos Bordon dafe93039f Merge pull request #1715 from wazuh/enhancement/1714-support-new-version-4.11.1
Support new Wazuh version 4.11.1
2025-02-06 09:16:02 -03:00
Carlos Anguita López 0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
Carlos Bordon 7be457e3ff Merge pull request #1711 from wazuh/merge-4.11.0-into-4.12.0
Merge 4.11.0 into 4.12.0
2025-02-04 09:33:31 -03:00
vcerenu 6e432a133d Resolving merge conflicts 2025-02-04 09:31:51 -03:00
Carlos Bordon f49bba385c Merge pull request #1710 from wazuh/merge-4.10.2-into-4.11.0
Merge 4.10.2 into 4.11.0
2025-02-04 09:21:48 -03:00
vcerenu a7bb241f8a Resolving merge conflicts 2025-02-04 09:15:11 -03:00
vcerenu 6e0311a330 Resolving merge conflicts 2025-02-04 09:14:33 -03:00
vcerenu bc6ab77773 Resolving merge conflicts 2025-02-04 08:57:45 -03:00
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