Commit Graph
2524 Commits
Author SHA1 Message Date
Gonzalo Acuña d0dacc8471 Merge pull request #1896 from wazuh/enhancement/1892-bumper-6.0.0
Enhancement/1892 bumper 6.0.0
2025-06-19 13:54:52 -03:00
Gonzalo Acuña f43faae24b Conflicts resolution 2025-06-19 12:28:14 -03:00
Gonzalo Acuña 31101be6d2 Bump to 6.0.0 2025-06-19 11:51:03 -03:00
Gonzalo Acuña 6bac41a05d Merge pull request #1895 from wazuh/enhancement/1892-bumper-main
Bumper propagation to main
2025-06-19 11:44:56 -03:00
Gonzalo Acuña 1bfc4ff4c2 Merge pull request #1894 from wazuh/enhancement/1892-bumper-4.14.0
Bumper propagation to 4.14.0
2025-06-19 11:42:05 -03:00
Gonzalo Acuña f5473f0004 Merge pull request #1893 from wazuh/enhancement/1892-bumper
Enhancement/1892 bumper
2025-06-19 11:35:49 -03:00
Gonzalo Acuña 1b75ebb67a Merge pull request #1890 from wazuh/enhancement/1882-add-pd-excp
Add permanent_data exceptions
2025-06-17 15:34:33 -03:00
vcerenu bbe5b5eb09 Add changelog 2025-06-17 15:05:52 -03:00
Carlos Bordon 4a9176b71e Merge pull request #1889 from wazuh/bug/wqa2229-add-admin-privilege-bumper
Added an admin flag to the repository bumper workflow merge action
2025-06-13 11:00:31 -03:00
Raul Del Pozo Moreno 056300b59d fix: added admin privilege to PR merge 2025-06-13 15:38:46 +02:00
Carlos Bordon a3479b0035 Merge pull request #1888 from wazuh/merge-4.14.0-into-main
Merge 4.14.0 into main
2025-06-13 10:04:25 -03:00
Carlos Anguita López f57f0b33f2 Merge branch '4.14.0' into merge-4.14.0-into-main 2025-06-13 14:59:48 +02:00
Carlos Bordon ba4e72a2e0 Merge pull request #1887 from wazuh/merge-4.13.1-into-4.14.0
Merge 4.13.1 into 4.14.0
2025-06-13 09:57:17 -03:00
Carlos Anguita López b374f4ba2e merge 4.13.1 into 4.14.0 2025-06-13 14:52:26 +02:00
vcerenu 126fc81200 Add permanent_data exceptions 2025-06-13 09:22:56 -03:00
Gonzalo Acuña e211c97f59 Merge pull request #1884 from wazuh/enhancement/1883-bump-4.13.1-version
Bump 4.13.1 version
2025-06-13 08:32:12 -03:00
vcerenu fb4a062f5a Bump 4.13.1 version 2025-06-13 08:26:34 -03:00
Gonzalo Acuña e2a2533501 Merge pull request #1880 from wazuh/bug/1780-unable-to-run-wazuh-cert-tool-with-proxy
Change validation of existing certs tool in S3 buckets
2025-06-11 08:55:58 -03:00
Carlos Anguita López c6369f9463 update changelog 2025-06-11 12:31:24 +02:00
Carlos Anguita 8edaa8ba9c Merge pull request #1879 from wazuh/enhancement/1877-revert-image-tag-for-4.13.0-alpha1 2025-06-11 10:47:07 +02:00
Enrique Araque edbfb73cde Revert docker image for 4.13.0-alpha1 2025-06-11 10:41:25 +02:00
Carlos Anguita ef3f76db58 Merge pull request #1878 from wazuh/enhancement/1877-bump-version-for-4.13.0-alpha1 2025-06-11 10:36:25 +02:00
Enrique Araque 0947d4c9a4 Bump revision and change image tag for 4.13.0-alpha1 2025-06-11 10:32:37 +02:00
Carlos Anguita López d5e4917414 change the output when checking if the cert tool exists 2025-06-10 16:46:57 +02:00
Carlos Bordon 5ef7f7ee00 Merge pull request #1876 from wazuh/bug/wqa2126-fix-secret-reference
Fix repository bumper workflow environment secret
2025-06-10 08:38:14 -03:00
Raul Del Pozo Moreno 8e9390d2e9 chore: abstracted version 2025-06-10 12:28:04 +02:00
Raul Del Pozo Moreno 5604b488c5 fix: fixed env secret 2025-06-10 11:43:13 +02:00
Carlos Bordon fb910000ff Merge pull request #1863 from wazuh/change/1860-integrate-bumper-script-via-github-action
Integrate bumper script via GitHub action
2025-06-09 13:12:28 -03:00
c-bordon 7f61ed18a4 Updated wildcard for workflow file name 2025-06-09 12:55:24 -03:00
c-bordon 79bc2516b2 Updated bumper script for tag variable 2025-06-09 12:53:25 -03:00
c-bordon 578619c0c1 Added exclude for cert tool image 2025-06-09 12:07:36 -03:00
Carlos Bordon 4833f362ee Merge branch '4.13.0' into change/1860-integrate-bumper-script-via-github-action 2025-06-09 10:26:50 -03:00
c-bordon 513cbda314 Updated PR message in log 2025-06-09 10:25:53 -03:00
c-bordon 75753a9714 Updated GH token 2025-06-09 10:18:44 -03:00
Carlos Bordon 60e57c9ff3 Merge pull request #1870 from wazuh/bug/1869-missing-malicious-ioc-lists-at-ossecconf-ruleset-configuration
Add missing `malicious-ioc` ruleset lists
2025-06-09 10:17:22 -03:00
Enrique Araque b8bcf7687e Fix changelog 2025-06-09 15:14:17 +02:00
Enrique Araque 6df029fde7 Update changelog 2025-06-09 12:59:07 +02:00
Enrique Araque 1e21b09e62 Add missing malicious-ioc ruleset lists 2025-06-09 11:54:09 +02:00
c-bordon b2f46deb7d Updated repository branch name 2025-06-05 16:41:55 -03:00
c-bordon e166d705c3 Fixed tag validation 2025-06-05 16:40:02 -03:00
c-bordon 61dfe53a08 Added tag argument for bumper script 2025-06-05 16:31:42 -03:00
Gonzalo Acuña 99a703136d Merge pull request #1868 from wazuh/merge-4.14.0-into-main
Merge 4.14.0 into main
2025-06-05 16:18:46 -03:00
c-bordon c111f8497e Merge 4.14.0 into main 2025-06-05 16:17:18 -03:00
Gonzalo Acuña 52570181ba Merge pull request #1867 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-06-05 16:11:45 -03:00
c-bordon 04f386e050 Merge 4.13.0 into 4.14.0 2025-06-05 16:09:20 -03:00
Gonzalo Acuña 472b990514 Merge pull request #1866 from wazuh/merge-4.12.1-into-4.13.0
Merge 4.12.1 into 4.13.0
2025-06-05 16:03:49 -03:00
c-bordon beaf93d9ab Moved wazuh-agent.conf file 2025-06-05 15:55:38 -03:00
c-bordon 44aa64c81f Fixes some merge differences 2025-06-05 15:54:04 -03:00
c-bordon cfa6e9bf81 Merge 4.12.1 into 4.13.0 2025-06-05 15:52:11 -03:00
c-bordon 46edb16dbb Updated changelog 2025-06-05 10:34:09 -03:00