 Jesus Garcia
|
95c2e34794
|
Update references of 'master' branch to 'main'
|
2025-02-11 08:56:58 -05:00 |
|
|
Carlos Bordon
|
971858cddd
|
Merge pull request #1610 from wazuh/merge-4.10.2-into-master
Merge 4.10.2 into master
|
2024-11-04 16:05:40 -03:00 |
|
|
Carlos Bordon
|
b9a52df0ff
|
Merge pull request #1609 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
|
2024-11-04 16:03:32 -03:00 |
|
|
Carlos Bordon
|
5252ce6c53
|
Merge pull request #1608 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
|
2024-11-04 16:00:31 -03:00 |
|
|
Gonzalo Acuña
|
5ef484647a
|
Merge branch '4.10.1' into merge-4.10.0-into-4.10.1
|
2024-11-04 16:00:02 -03:00 |
|
|
Carlos Bordon
|
f9adac8c56
|
Merge pull request #1607 from wazuh/merge-4.9.2-into-4.10.0
Merge 4.9.2 into 4.10.0
|
2024-11-04 15:57:10 -03:00 |
|
|
Gonzalo Acuña
|
8bb96f3d69
|
Merge branch '4.10.0' into merge-4.9.2-into-4.10.0
|
2024-11-04 15:50:45 -03:00 |
|
|
Carlos Bordon
|
574c7b05c7
|
Merge pull request #1599 from wazuh/enhancement/1596-revert-images-tag
Revert images tag for 4.9.2 rc1
v4.9.2
|
2024-10-28 11:36:46 -03:00 |
|
|
vcerenu
|
fc563acdaa
|
Revert images tag
|
2024-10-28 11:34:08 -03:00 |
|
|
Gonzalo Acuña
|
0778474353
|
Merge pull request #1598 from wazuh/enhancement/1596-change-image-tag
Change images tag for 4.9.2 rc1
|
2024-10-28 11:31:22 -03:00 |
|
|
vcerenu
|
6038fce076
|
Change images tag
|
2024-10-28 11:24:12 -03:00 |
|
|
Gonzalo Acuña
|
3b7fa8d000
|
Merge pull request #1597 from wazuh/enhancement/1596-bump-revision
Update 4.9.2 Revision
|
2024-10-28 11:11:51 -03:00 |
|
|
vcerenu
|
4116634ddd
|
Bump Revision
|
2024-10-28 11:06:52 -03:00 |
|
|
Carlos Anguita
|
fbaee58767
|
Merge pull request #1594 from wazuh/enhancement/1593-new-version-492
Support new wazuh version 4.9.2
|
2024-10-25 12:29:39 +02:00 |
|
|
Carlos Anguita López
|
8b18fb613c
|
support new wazuh version 4.9.2
|
2024-10-25 12:09:57 +02:00 |
|
|
Carlos Anguita
|
45366e121f
|
Merge pull request #1588 from wazuh/enhancement/1585-revert-image-tag
Revert image tag for 4.10.0-alpha2
|
2024-10-18 11:02:06 +02:00 |
|
|
Enrique Araque
|
93ea37158d
|
Revert image tag for 4.10.0-alpha2
|
2024-10-18 10:59:10 +02:00 |
|
|
Carlos Anguita
|
1f58526256
|
Merge pull request #1587 from wazuh/enhancement/change-docker-image-tag
Change image tag for 4.10.0-alpha2
|
2024-10-18 10:54:30 +02:00 |
|
|
Enrique Araque
|
041cea8a9a
|
Add alpha2 to docker 4.10.0 images
|
2024-10-18 10:50:04 +02:00 |
|
|
Carlos Anguita
|
53db9379b8
|
Merge pull request #1586 from wazuh/enhancement/1585-bump-revision-41003
Bump revision for 4.10.0-alpha2
|
2024-10-18 10:46:27 +02:00 |
|
|
Enrique Araque
|
02074c678e
|
Bump revision to 41003
|
2024-10-18 10:43:01 +02:00 |
|
|
Gonzalo Acuña
|
084530ef80
|
Merge pull request #1584 from wazuh/merge-4.10.2-into-master
Merge 4.10.2 into master
|
2024-10-17 13:06:55 -03:00 |
|
|
vcerenu
|
69df531ca9
|
Resolve conflicts
|
2024-10-17 13:04:31 -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 |
|
|
Gonzalo Acuña
|
19f4aaea4d
|
Merge pull request #1577 from wazuh/enhancement/1574-revert-image-tag
Revert image tag for 4.9.1-rc4
v4.9.1
|
2024-10-15 13:06:04 -03:00 |
|
|
vcerenu
|
5bbacebe89
|
Revert image tag for rc4
|
2024-10-15 12:59:17 -03:00 |
|
|
Carlos Bordon
|
f9c5215c8b
|
Merge pull request #1576 from wazuh/enhancement/1574-change-image-tag
Change image tag for 4.9.1-rc4
|
2024-10-15 12:52:52 -03:00 |
|
|
vcerenu
|
564e2b3ec4
|
change image taf for rc4
|
2024-10-15 12:41:31 -03:00 |
|
|
Carlos Bordon
|
c5970f2922
|
Merge pull request #1575 from wazuh/enhancement/1574-bump-revision
Bump Revision of new stageRC 4 for 4.9.1
|
2024-10-15 12:36:03 -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 |
|