2295 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gonzalo Acuña	e1bf0a0dc5	Merge pull request #1757 from wazuh/enhancement/1735-remove-stable-branch ... Remove 'stable' branch ocurrencies	2025-03-18 14:28:55 -03:00
Jesus Garcia	c1565a5553	Remove 'stable' branch ocurrencies	2025-03-18 11:16:52 -05:00
Gonzalo Acuña	75fb9a4e4c	Merge pull request #1754 from wazuh/merge-4.12.0-into-4.13.0 ... Merge 4.12.0 into 4.13.0	2025-03-12 14:16:07 -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
Gonzalo Acuña	4aaf0a1b8c	Merge pull request #1750 from wazuh/enhancement/5142-change-wazuhkeystore-use ... Modify wazuh-keystore use	2025-03-12 09:31:23 -03:00
vcerenu	1186c6f9d6	Modify wazuh-keystore use	2025-03-11 15:31:31 -03:00
vcerenu	87a3ccd3ee	Add changelog	2025-03-11 15:08:41 -03:00
vcerenu	7f08f4cbff	Modify wazuh-keystore use	2025-03-11 15:07:14 -03:00
Gonzalo Acuña	607b01351e	Merge pull request #1749 from wazuh/enhancement/1748-bump-4130-version ... Bump 4.13.0 version	2025-03-10 14:03:15 -03:00
vcerenu	b2de3600ce	Bump 4.13.0 version	2025-03-10 13:44:19 -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
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