Commit Graph

2141 Commits

Author SHA1 Message Date
vcerenu
369560f59f Fix permanent data scripts 2024-11-01 11:45:39 -03:00
Gonzalo Acuña
f809a1ebbb Merge pull request #1583 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-10-17 12:52:29 -03:00
vcerenu
a5c313843e Resolve conflicts 2024-10-17 12:49:32 -03:00
Gonzalo Acuña
ea0e679c27 Merge pull request #1582 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
2024-10-17 12:42:06 -03:00
vcerenu
7ca14b9fc8 Resolve conflicts 2024-10-17 12:34:40 -03:00
vcerenu
42977e3131 Resolve conflicts 2024-10-17 12:33:13 -03:00
Gonzalo Acuña
f4e7d1938d Merge pull request #1581 from wazuh/merge-4.9.1-into-4-10-0
Merge 4.9.1 into 4.10.0
2024-10-17 12:28:24 -03:00
vcerenu
691694a38d Resolve conflicts 2024-10-17 12:22:38 -03:00
vcerenu
5bbacebe89 Revert image tag for rc4 2024-10-15 12:59:17 -03:00
vcerenu
564e2b3ec4 change image taf for rc4 2024-10-15 12:41:31 -03:00
vcerenu
276c8a2e6c Bump revision 2024-10-15 12:05:27 -03:00
Gonzalo Acuña
b1f0a1f46a Merge pull request #1573 from wazuh/enhancement/1570-revert-image-tag
Revert image tag to 4.10.0
2024-10-10 13:15:17 -03:00
JESUS D. GARCIA
5795fa154d Revert image tag to 4.10.0 2024-10-10 11:10:29 -05:00
Gonzalo Acuña
424846ae40 Merge pull request #1572 from wazuh/enhancement/1570-docker-compose-version
Update image tag versions to 4.10.0-alpha2
2024-10-10 13:03:03 -03:00
JESUS D. GARCIA
db4133d7a8 Update docker-compose versions 2024-10-10 10:54:12 -05:00
Carlos Bordon
50769ef689 Merge pull request #1571 from wazuh/enhancement/1570-add-support-for-alpha-2
Add support for alpha 2
2024-10-10 12:48:49 -03:00
JESUS D. GARCIA
dbb776690d Bump revision 2024-10-10 10:43:13 -05:00
Gonzalo Acuña
60746362ac Merge pull request #1569 from wazuh/bug/1564-fix-typos-entrypoint
Fix typos into Wazuh manager entrypoint
2024-10-10 12:09:32 -03:00
vcerenu
f61af29c6b Add changelog 2024-10-10 12:07:39 -03:00
vcerenu
1aa149933b Fix typos 2024-10-10 11:09:09 -03:00
Gonzalo Acuña
06a797d793 Merge pull request #1568 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-10-10 08:39:25 -03:00
vcerenu
8695a087d5 Resolving merge conflicts 2024-10-10 08:05:07 -03:00
David Correa Rodríguez
61b3f5f6ed Merge pull request #1561 from wazuh/enhancement/1558-revert-image-tag
Reverted image tag for 4.9.1-rc3
2024-10-04 10:29:53 +02:00
David Correa Rodríguez
868c371c31 Reverted image tag for 4.9.1-rc3 2024-10-04 10:27:14 +02:00
David Correa Rodríguez
bd7aedc0dd Merge pull request #1560 from wazuh/enhancement/1558-change-image-tag
Changed image tag for 4.9.1-rc3
2024-10-04 10:25:18 +02:00
David Correa Rodríguez
4177d1095c Changed image tag for 4.9.1-rc3 2024-10-04 10:23:16 +02:00
David Correa Rodríguez
97e4dde53d Merge pull request #1559 from wazuh/enhancement/1558-bump-revision
Bumped revision for 4.9.1-RC3
2024-10-04 10:19:46 +02:00
David Correa Rodríguez
884151b322 Bumped revision for 4.9.1-RC3 2024-10-04 10:12:37 +02:00
Carlos Bordon
447c0bdaf8 Merge pull request #1557 from wazuh/Bump-4.10.2-branch
Bumped branch 4.10.2 to 4.10.2 version
2024-10-03 12:31:49 -03:00
c-bordon
e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -03:00
Carlos Bordon
d237faa5ab Merge pull request #1555 from wazuh/bug/1554-wazuh-server-container-restarting-in-loop
Revert create_user.py script deletion
2024-10-03 08:38:10 -03:00
Enrique Araque
92d0582201 Revert create_user.py script deletion 2024-10-03 13:18:25 +02:00
Gonzalo Acuña
cc206659cc Merge pull request #1551 from wazuh/enhancement/1864-improve-push-docker-images-workflow
Improve the push docker images workflow
2024-10-01 15:21:25 -03:00
JESUS D. GARCIA
8bafe1295b Change the dev default value to true for the workflow_dispatch 2024-10-01 10:06:13 -05:00
JESUS D. GARCIA
027b26047f Update Procedure_push_docker_images.yml 2024-09-30 16:20:31 -05:00
Gonzalo Acuña
af023a9b44 Merge pull request #1550 from wazuh/enhancement/1547-revert-docker-image-tag
Revert Wazuh images to 4.9.1 version
2024-09-27 09:29:25 -03:00
c-bordon
0ec38df1c7 Revert Wazuh images to -rc2 version 2024-09-27 09:26:49 -03:00
David Correa Rodríguez
be0ac01c4a Merge pull request #1549 from wazuh/enhancement/1547-update-docker-image-tag
Updated Wazuh images to -rc2 version
2024-09-27 14:20:32 +02:00
c-bordon
62ae93eee9 Updated Wazuh images to -rc2 version 2024-09-27 09:18:13 -03:00
David Correa Rodríguez
e292957740 Merge pull request #1548 from wazuh/enhancement/1418-support-new-stage-rc2-for-491
Bump 4.9.1 revision
2024-09-27 14:14:26 +02:00
c-bordon
eb4efb3458 Bump 4.9.1 revision 2024-09-27 09:05:56 -03:00
Carlos Bordon
46d6dc8fe5 Merge pull request #1544 from wazuh/enhancement/1543-bump-4.10.1-version
Bump new Wazuh 4.10.1 version
2024-09-24 12:26:03 -03:00
vcerenu
08ba82d16d Bump new Wazuh 4.10.1 version 2024-09-24 12:09:02 -03:00
David Correa Rodríguez
9d882fcd67 Merge pull request #1541 from wazuh/enhancement/1535-revert-tag
Reverted image tag for 4.10.0-alpha1
2024-09-24 09:36:31 +02:00
David Correa Rodríguez
9e1c33245d Reverted image tag for 4.10.0-alpha1 2024-09-24 09:32:47 +02:00
David Correa Rodríguez
6dfa4a2e32 Merge pull request #1540 from wazuh/enhancement/1535-change-tag
Changed image tag for 4.10.0-alpha1
2024-09-24 09:30:23 +02:00
David Correa Rodríguez
8ab3018e62 Changed image tag for 4.10.0-alpha1 2024-09-24 09:28:31 +02:00
David Correa Rodríguez
e08a3d85db Merge pull request #1539 from wazuh/enhancement/1535-bump-revision
Bumped revision for 4.10.0-alpha1
2024-09-24 09:11:24 +02:00
David Correa Rodríguez
42db717668 Bumped revision for 4.10.0-alpha1 2024-09-24 08:50:11 +02:00
David Correa Rodríguez
7b1d2836fa Merge pull request #1537 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-09-23 12:29:41 +02:00