Commit Graph
1890 Commits
Author SHA1 Message Date
Victor Ereñú b022f9f5c1 Merge pull request #1325 from wazuh/merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
2024-04-30 07:18:11 -03:00
vcerenu 390a71ebea resolving conflicts 2024-04-30 07:03:06 -03:00
Victor Ereñú 7063480f1f Merge pull request #1324 from wazuh/merge-4.7.4-into-4.8.0
Merge 4.7.4 into 4.8.0
2024-04-30 06:57:18 -03:00
vcerenu 4c74ebfc80 resolving conflicts 2024-04-30 05:39:50 -03:00
David Correa Rodríguez ec76ea8d92 Merge pull request #1318 from wazuh/rollback-image-version v4.7.4 2024-04-25 10:32:50 +02:00
vcerenu ce0a855c3d rollback image name 2024-04-25 05:25:17 -03:00
David Correa Rodríguez d10af3b669 Merge pull request #1317 from wazuh/change-image-rc2 2024-04-25 10:19:01 +02:00
vcerenu b7609311dc change image version 2024-04-25 05:12:59 -03:00
Victor Ereñú 81c42d02b1 Merge pull request #1316 from wazuh/bump-revision-474
Bump revision 40717
2024-04-25 05:09:32 -03:00
vcerenu ee3159b225 bump revision 2024-04-25 04:58:29 -03:00
David Correa Rodríguez 3bed3a3a31 Merge pull request #1311 from wazuh/revert-tag-4.7.4-rc1
Reverted tag for 4.7.4 RC1
2024-04-23 09:51:10 +02:00
David Correa Rodríguez 9109104af2 Reverted tag for 4.7.4 RC1 2024-04-23 09:46:03 +02:00
David Correa Rodríguez 2efc6c56fa Merge pull request #1310 from wazuh/change-tag-4.7.4-rc1
Updated tag for 4.7.4 RC1
2024-04-23 09:41:01 +02:00
David Correa Rodríguez daf1e837a1 Updated tag for 4.7.4 RC1 2024-04-23 09:32:02 +02:00
David Correa Rodríguez 9881957f86 Merge pull request #1309 from wazuh/bump-revision-40716
Bumped revision to 40716
2024-04-23 09:24:55 +02:00
David Correa Rodríguez 8c874235bf Bumped revision to 40716 2024-04-23 09:20:23 +02:00
Victor Ereñú 1e7d1c62ec Merge pull request #1305 from wazuh/revert-beta6
Rename docker image for 4.8.0
2024-04-19 05:57:31 -03:00
vcerenu 72421d608a revert beta6 changes 2024-04-19 05:50:57 -03:00
Victor Ereñú a9efe64d33 Merge pull request #1304 from wazuh/beta6-tag
Rename docker image for beta6
2024-04-19 05:36:15 -03:00
vcerenu 650d2936c4 add beta6 tag 2024-04-19 05:19:41 -03:00
Victor Ereñú c9cf940a19 Merge pull request #1303 from wazuh/bump-revision-40808
Bumped revision to 40808
2024-04-19 05:16:42 -03:00
David Correa Rodríguez 353ea5976a Bumped revision to 40808 2024-04-19 09:56:27 +02:00
Gonzalo Acuña d2181f78cd Merge pull request #1300 from wazuh/bump-version-4.7.4
Bumped version to 4.7.4
2024-04-18 10:24:02 -03:00
David Correa Rodríguez d904595787 Bumped version to 4.7.4 2024-04-18 15:16:32 +02:00
Gonzalo Acuña b62a1d5c94 Merge pull request #1294 from wazuh/1293-fix-480-beta5-al2023-vulnerabilities
Fix 4.8.0 beta-5 AL2023 Vulnerabilities
2024-04-10 12:04:40 -03:00
Carlos Anguita López 92d6f87091 Changed Docker base image ocurrences from amazonlinux:2023.3.20240304.0 to amazonlinux:2023 2024-04-10 13:18:01 +02:00
David Correa Rodríguez 74e30e89f8 Merge pull request #1288 from wazuh/bump-revision-40807
Bumped revision to 40807
2024-04-05 12:33:43 +02:00
David Correa Rodríguez cbeb18c13f Bumped revision to 40807 2024-04-05 12:09:39 +02:00
David Correa Rodríguez 6afcc00ba7 Merge pull request #1284 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-04-01 11:07:53 +02:00
David Correa Rodríguez b13aef91d1 Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-04-01 10:58:25 +02:00
David Correa Rodríguez b61953cc35 Merge pull request #1283 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-04-01 10:57:54 +02:00
David Correa Rodríguez 4b98b24999 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-04-01 10:48:42 +02:00
David Correa Rodríguez 1fea52d4d0 Merge pull request #1282 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-04-01 10:47:39 +02:00
David Correa Rodríguez 97ba114f8e Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-04-01 10:06:22 +02:00
Gonzalo Acuña fc1bc7796a Merge pull request #1279 from wazuh/1253-fix-pr-test-multi
Fix PR test
2024-03-27 16:04:57 -03:00
vcerenu cbdc152dda clean disk and change way to wait Cluster start 2024-03-27 14:25:31 -03:00
Gonzalo Acuña 12653111bd Merge pull request #1274 from wazuh/513-delete-create-user
Delete create_user.py script
2024-03-25 09:45:50 -03:00
Gonzalo Acuña e866a8d013 Merge pull request #1271 from wazuh/22511-delete-syslog-and-dpkg-configuration
Delete syslog and dpkg log configuration
2024-03-22 09:42:32 -03:00
vcerenu e03cfde3bc delete create_user.py script 2024-03-22 08:47:32 -03:00
vcerenu 866ee48871 delete syslog and dpkg log configuration 2024-03-21 07:00:57 -03:00
Gonzalo Acuña 654d1dbf36 Merge pull request #1268 from wazuh/bug/1193-review-version-references-in-the-master-branch
Fixed references to 4.8 version
2024-03-20 12:58:19 -03:00
David Correa Rodríguez 219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01:00
Gonzalo Acuña b1fec6690b Merge pull request #1266 from wazuh/1265-cert-creator-update
Update query about Wazuh manager cont names
2024-03-15 12:39:36 -03:00
vcerenu a8754c54bc update query about Wazuh manager cont names 2024-03-15 11:29:46 -03:00
Gonzalo Acuña b0c5fb3559 Merge pull request #1261 from wazuh/update-AL2023-20240304
Update AL2023 20240304
2024-03-14 08:56:51 -03:00
vcerenu 02ee94f312 update al2024 version 2024-03-13 11:58:52 -03:00
David Correa Rodríguez 69f9ab8de2 Merge pull request #1258 from wazuh/bump-version-40806
Bumped version to 40806
2024-03-12 11:06:52 +01:00
David Correa Rodríguez 89f3b0d600 Bumped version to 40806 2024-03-12 11:01:41 +01:00
Gonzalo Acuña 51e17d2dac Merge pull request #1247 from wazuh/1220-modify-uid
Modify uid and gid
2024-03-11 11:26:11 -03:00
vcerenu 031db43568 rollback root-ca filename 2024-03-11 10:17:49 -03:00